Blender Git Loki
Git Commits -> Revision e7e5faf
Revision e7e5faf by Dalai Felinto (soc-2011-cucumber) January 11, 2012, 02:13 (GMT) |
svn merge ^/trunk/blender -r42742:43270 conflicted files I had to fix manually: -------------------------------------- wm.py properties_particle.py properties_game.py rna_scene.c KX_BlenderInputDevice.h BL_BlenderDataConversion.cpp GPG_Application.cpp BL_Material.cpp KX_FontObject.cpp |
Commit Details:
Full Hash: e7e5fafb9358ea4f85984e7bfbe00c5cbd87ffd5
SVN Revision: 43275
Parent Commits: dbdd098, e33357e