]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commit
projects / people / ms / ipfire-2.x.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a081c60 576da81)
Merge branch 'firewall' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into...
authorAlexander Marx <amarx@ipfire.org>
Thu, 8 Aug 2013 06:38:54 +0000 (08:38 +0200)
committerAlexander Marx <amarx@ipfire.org>
Thu, 8 Aug 2013 06:38:54 +0000 (08:38 +0200)
commit3678c3bbc8f1f04d6dbf94583aeb7b86a07e188f
treeb1c99446bd94f61b6573c0cf37b4824a0f8ef4f8tree
parenta081c600de16b22ea7461287378ba42a8ea7a5b1commit | diff
parent576da815b9c271f4418bf6ce88be8e73b90e2434commit | diff
Merge branch 'firewall' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall

Conflicts:
config/forwardfw/rules.pl
config/rootfiles/common/apache2
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/configroot
lfs/strongswan
config/backup/include diff1 | diff2 | blob | history
config/forwardfw/rules.pl diff1 | diff2 | blob | history
langs/de/cgi-bin/de.pl diff1 | diff2 | blob | history
langs/en/cgi-bin/en.pl diff1 | diff2 | blob | history
lfs/strongswan diff1 | diff2 | blob | history
Michael's tree of IPFire 2.x.