]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: ee11332 88af830)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Jun 2011 22:01:26 +0000 (00:01 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Jun 2011 22:01:26 +0000 (00:01 +0200)
1  2 
config/rootfiles/oldcore/48/exclude patch | diff1 | diff2 | blob | history

diff --combined config/rootfiles/oldcore/48/exclude
index 6fe46b4c89f3ebdb1bdd76150fdfd63c99546a19,ce199d8511a8260b17b0fa4f8e154be635fc8e5a..ce199d8511a8260b17b0fa4f8e154be635fc8e5a
--- 1/config/rootfiles/oldcore/48/exclude
--- 2/config/rootfiles/core/48/exclude
+++ b/config/rootfiles/oldcore/48/exclude
@@@ -1,1 -1,1 +1,1 @@@
- /srv/web/ipfire/html/proxy.pac
+ srv/web/ipfire/html/proxy.pac
Peter's tree of IPFire 2.x