repositories / SugarCubes.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b2fade 9bdc3e7)
Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen
authorAlexander Green <alexandergreen22@gmail.com>
Fri, 8 Nov 2013 11:10:41 +0000 (03:10 -0800)
committerAlexander Green <alexandergreen22@gmail.com>
Fri, 8 Nov 2013 11:10:41 +0000 (03:10 -0800)
weird stuff changed default editor during merge
ust ordering stuff in sugarcubes list

1  2 
MarkSlee.pde patch | diff1 | diff2 | blob | history
_Internals.pde patch | diff1 | diff2 | blob | history

diff --cc MarkSlee.pde
Simple merge
diff --cc _Internals.pde
Simple merge
Last FOSS code of SugarCubes - http://symmetrylabs.com/