]> git.localhorst.tv Git - l2e.git/commit - Release/src/graphics/subdir.mk
projects / l2e.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf552d26f537af9fa48255bd71cdc1a0a1b860bac
tree57aec1a752b5196b325e77e2de3652c7874bfc7ftree | snapshot
parent5ada219caec0535c3a3ad9a120bc4abd341d1f81commit | diff
parent9d645a0059d185291f63c1375bd4e5ae844acde6commit | diff
Merge branch 'master' into menus

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
an attempt to reimplement Lufia 2