recent merges lost changes in this file, manually merge changes from -r37078:37500
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 10:14:02 +0000 (10:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 10:14:02 +0000 (10:14 +0000)
commitaed306f2197d4cbf1738db46b88eb30646c2cbbf
tree12f9802188fdb2b44dd88e343764c808cf010ed3
parent3c68357e510bfc6abfbe27dc78e1929a5d209fef
recent merges lost changes in this file, manually merge changes from -r37078:37500
source/blender/editors/util/ed_util.c