test2

Go to file

Tamito Kajiyama 65668dc5eb Merged changes in the trunk up to revision 41368.

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c

2011-10-30 02:03:40 +00:00

build_files

Merged changes in the trunk up to revision 41368.

2011-10-30 02:03:40 +00:00

doc

Merged changes in the trunk up to revision 41368.

2011-10-30 02:03:40 +00:00

extern

edits to cmake

2011-10-25 13:41:43 +00:00

intern

Merged changes in the trunk up to revision 41368.

2011-10-30 02:03:40 +00:00

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

release

Merged changes in the trunk up to revision 41368.

2011-10-30 02:03:40 +00:00

source

Merged changes in the trunk up to revision 41368.

2011-10-30 02:03:40 +00:00

CMakeLists.txt

Fix RelWithDebInfo build.

2011-10-29 16:14:38 +00:00

COPYING

== docs ==

2010-10-13 14:44:22 +00:00

GNUmakefile

Another set of UI messages fixes and tweaks! No functional changes.

2011-10-23 19:54:06 +00:00

SConstruct

Another set of UI messages fixes and tweaks! No functional changes.

2011-10-23 19:54:06 +00:00

Languages

C++ 78%

Python 14.9%

C 2.9%

GLSL 1.9%

CMake 1.2%

Other 0.9%