Tamito Kajiyama 8135cc9f95 Merged changes in the trunk up to revision 47700. ... Conflicts resolved: source/blender/blenkernel/BKE_main.h source/blender/blenkernel/CMakeLists.txt source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/editors/interface/resources.c source/blender/makesdna/DNA_ID.h source/blender/makesdna/DNA_action_types.h source/blender/makesdna/intern/makesdna.c source/blender/makesrna/SConscript source/blender/makesrna/intern/rna_internal.h source/blender/makesrna/intern/rna_main.c source/blender/makesrna/intern/rna_main_api.c source/blender/windowmanager/WM_types.h		2012-06-10 20:50:43 +00:00
..
blender	Merged changes in the trunk up to revision 47700.	2012-06-10 20:50:43 +00:00
blenderplayer	Merged changes in the trunk up to revision 47700.	2012-06-10 20:50:43 +00:00
creator	Merged changes in the trunk up to revision 47700.	2012-06-10 20:50:43 +00:00
darwin	replace former applescript with an editable one	2011-10-19 19:15:35 +00:00
gameengine	Committing patch [#31704] "Patch to fix keyboard sensor from blocking quit game key binding" by Jay Parker. This patch fixes [#31671] "Keyboard Sensor blocks Quit Game Key Binding"	2012-06-10 19:32:57 +00:00
icons	set svn end of lines to native	2011-05-09 08:15:38 +00:00
tests	code cleanup: remove mode comments, these were applied very un-evenly across a few files.	2012-05-27 13:22:43 +00:00
CMakeLists.txt	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
SConscript	Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications.	2012-04-24 12:57:58 +00:00