Go to file
Tamito Kajiyama 5524ed9ba2 Merged changes in the trunk up to revision 55700.
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
2013-04-01 13:47:19 +00:00
build_files Merged changes in the trunk up to revision 55700. 2013-04-01 13:47:19 +00:00
doc Merged changes in the trunk up to revision 55546. 2013-03-24 12:13:13 +00:00
extern Merged changes in the trunk up to revision 55700. 2013-04-01 13:47:19 +00:00
intern Merged changes in the trunk up to revision 55700. 2013-04-01 13:47:19 +00:00
release Merged changes in the trunk up to revision 55700. 2013-04-01 13:47:19 +00:00
source Merged changes in the trunk up to revision 55700. 2013-04-01 13:47:19 +00:00
CMakeLists.txt Merged changes in the trunk up to revision 55700. 2013-04-01 13:47:19 +00:00
COPYING == docs == 2010-10-13 14:44:22 +00:00
GNUmakefile correct too-big allocation in mesh beautify. 2013-04-01 07:57:33 +00:00
SConstruct Merged changes in the trunk up to revision 55546. 2013-03-24 12:13:13 +00:00