]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d870c4 03b08c0)
Merge remote-tracking branch 'amarx/BETA3' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Mar 2014 14:32:00 +0000 (15:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Mar 2014 14:32:00 +0000 (15:32 +0100)
1  2 
html/cgi-bin/vpnmain.cgi patch | diff1 | diff2 | blob | history
langs/de/cgi-bin/de.pl patch | diff1 | diff2 | blob | history
langs/en/cgi-bin/en.pl patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/vpnmain.cgi
Simple merge
diff --cc langs/de/cgi-bin/de.pl
Simple merge
diff --cc langs/en/cgi-bin/en.pl
Simple merge
Michael's tree of IPFire 2.x.