Blender Git Loki
Git Commits -> Revision 1dd460d
Revision 1dd460d by Antonis Ryakiotakis (soc-2013-paint) August 28, 2013, 10:49 (GMT) |
Fix some merge collisions from yesterday |
Commit Details:
Full Hash: 1dd460dbf6a4cc21adfa6b3b2feb084f1f62ec39
SVN Revision: 59594
Parent Commit: 789e4e4
Lines Changed: +1, -346
1 Deleted Path:
/intern/cycles/app/cycles_test.cpp (+0, -346)
1 Modified Path:
/source/blender/editors/interface/interface_widgets.c (+1, -0) (Diff)