Joshua Leung b1a106dd49 NLA SoC: Merge from 2.5 ...

21210 to 21300

Note to self: the next merge will be messy again, since 2 commits occurred this one was complete

2009-07-02 03:32:57 +00:00

..

buildinfo.c

2.50:

2009-06-08 20:08:19 +00:00

CMakeLists.txt

NLA SoC: Merge from 2.5

2009-07-02 03:32:57 +00:00

creator.c

2.5

2009-06-19 23:05:21 +00:00

Makefile

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD

2009-04-20 15:06:46 +00:00

SConscript

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD

2009-04-20 15:06:46 +00:00