marcus13345 d144576b31 Merge remote-tracking branch 'origin/master' ... Conflicts: src/MAndEngine/ImageCreator.java src/MAndEngine/Utils.java		2015-04-11 23:20:05 -04:00
src/MAndEngine	Merge remote-tracking branch 'origin/master'	2015-04-11 23:20:05 -04:00
.classpath	so like, now works with 1.6...	2015-03-03 15:02:11 -05:00
.gitattributes	🎊 Added .gitattributes & .gitignore files	2014-10-07 14:54:24 -04:00
.gitignore	new gitignore, not much else.	2014-10-08 22:40:33 -04:00
.project	ADDED ALL THE THINGS	2014-10-07 14:55:52 -04:00