svn merge -r15118:15119 https://svn.blender.org/svnroot/bf-blender/branches/soc...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jun 2008 16:38:55 +0000 (16:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jun 2008 16:38:55 +0000 (16:38 +0000)
commit61193cf2302fde403d39085d67e300ec2e9ad0f0
tree4738f24413ca715dd722a18b072d387ccfba988e
parente26323bcdd89f992ab772cb8860502e2bfe2e681
svn  merge  -r15118:15119 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-quorn
source/blender/blenkernel/intern/text.c