Piment Noir Git Repositories - SugarCubes.git/commit - SugarCubes.pde.orig

repositories / SugarCubes.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1c44211 b8bb274)

author	Alexander Green <alexandergreen22@gmail.com>
	Fri, 15 Nov 2013 07:44:26 +0000 (23:44 -0800)
committer	Alexander Green <alexandergreen22@gmail.com>
	Fri, 15 Nov 2013 07:44:26 +0000 (23:44 -0800)
commit	09f7f5dff86f1b54a789e39b4f6ab24ed072c17d
tree	3b47b59bffc4609e3a4e98163bcba130f8c7d9b7	tree \| snapshot (zip tar.gz tar.bz2)
parent	1c44211b1a15965afee7056a2f1d43a1306df61b	commit \| diff
parent	b8bb27489db7dc687bf150576e9d9439f1fa17a6	commit \| diff

Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen
LX point stuff, etc don't know if it works yet
Conflicts:
AlexGreen.pde
SugarCubes.pde

AlexGreen.pde	diff1 \|	diff2 \|	blob \| history
AlexGreen.pde.orig	diff1 \|	\|	blob \| history
MarkSlee.pde	diff1 \|	diff2 \|	blob \| history
SugarCubes.pde	diff1 \|	diff2 \|	blob \| history
SugarCubes.pde.orig	\|	\|	blob
_Internals.pde	diff1 \|	diff2 \|	blob \| history
_Mappings.pde	diff1 \|	diff2 \|	blob \| history

Last FOSS code of SugarCubes - http://symmetrylabs.com/