]> git.localhorst.tv Git - l2e.git/commitdiff
projects / l2e.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ada219 9d645a0)
Merge branch 'master' into menus
authorDaniel Karbach <daniel.karbach@localhorst.tv>
Sun, 11 Nov 2012 15:36:25 +0000 (16:36 +0100)
committerDaniel Karbach <daniel.karbach@localhorst.tv>
Sun, 11 Nov 2012 15:36:25 +0000 (16:36 +0100)
I'm not putting up with changing build settings on every checkout

Conflicts:
Debug/makefile
Debug/sources.mk
Debug/src/graphics/subdir.mk
Release/makefile
Release/sources.mk
Release/src/graphics/subdir.mk


Trivial merge
an attempt to reimplement Lufia 2