]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08fc3fd 52ac8f6)
Merge branch 'lcdproc' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 May 2013 18:01:32 +0000 (20:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 May 2013 18:01:32 +0000 (20:01 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Timo's tree of IPFire 2.x