Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ... Conflicts resolved: source/blender/editors/interface/resources.c		2012-09-30 13:16:55 +00:00
..
bl_operators	Merged changes in the trunk up to revision 50956.	2012-09-30 13:16:55 +00:00
bl_ui	Merged changes in the trunk up to revision 50956.	2012-09-30 13:16:55 +00:00
keyingsets_builtins.py	don't have spaces in idnames, confuses py types:	2012-04-26 18:07:15 +00:00