]> 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: 2b1ff41 f64c996)
Merge remote-tracking branch 'earl/tor' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 14 Sep 2013 12:37:18 +0000 (14:37 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 14 Sep 2013 12:37:18 +0000 (14:37 +0200)
Conflicts:
lfs/tor

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
Michael's tree of IPFire 2.x.