]> git.localhorst.tv Git - l2e.git/commitdiff
projects / l2e.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59c735f 107657a)
Merge branch 'master' into feature-33-capsules
authorDaniel Karbach <daniel.karbach@localhorst.tv>
Sun, 9 Dec 2012 14:30:43 +0000 (15:30 +0100)
committerDaniel Karbach <daniel.karbach@localhorst.tv>
Sun, 9 Dec 2012 14:30:43 +0000 (15:30 +0100)
needed for fixed cbp file


Trivial merge
an attempt to reimplement Lufia 2