]> git.localhorst.tv Git - l2e.git/commitdiff
projects / l2e.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67f6bb1 5228f22)
Merge branch 'master' into feature-33-capsules
authorDaniel Karbach <daniel.karbach@localhorst.tv>
Sun, 9 Dec 2012 14:33:14 +0000 (15:33 +0100)
committerDaniel Karbach <daniel.karbach@localhorst.tv>
Sun, 9 Dec 2012 14:33:14 +0000 (15:33 +0100)
I am a dork

1  2 
l2e.cbp patch | diff1 | diff2 | blob | history

diff --cc l2e.cbp
Simple merge
an attempt to reimplement Lufia 2