svn merge ^/trunk/blender -r43554:43564
authorCampbell Barton <ideasman42@gmail.com>
Fri, 20 Jan 2012 15:34:40 +0000 (15:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 20 Jan 2012 15:34:40 +0000 (15:34 +0000)
commit0198df7956125180d5b9c50638a0778a3236d88f
treeaab6bbacff4d047039c5fa408eac68006928c8f9
parentb3938cee638101df97e056cdf19891be84340142
parent172685322638f92906ef3baf39d92399903bdfb3
svn merge ^/trunk/blender -r43554:43564
source/blender/blenkernel/intern/key.c
source/blender/editors/uvedit/uvedit_smart_stitch.c