]> git.ipfire.org Git - people/amarx/ipfire-2.x.git/commitdiff
projects / people / amarx / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f8891c 9e7f277)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x master
authorAlexander Marx <amarx@ipfire.org>
Wed, 12 Dec 2012 15:15:09 +0000 (16:15 +0100)
committerAlexander Marx <amarx@ipfire.org>
Wed, 12 Dec 2012 15:15:09 +0000 (16:15 +0100)
1  2 
langs/de/cgi-bin/de.pl patch | diff1 | diff2 | blob | history
langs/en/cgi-bin/en.pl patch | diff1 | diff2 | blob | history

diff --cc langs/de/cgi-bin/de.pl
Simple merge
diff --cc langs/en/cgi-bin/en.pl
Simple merge
IPFire 2.x development tree