]> git.ipfire.org Git - people/trikolon/ipfire-2.x.git/commitdiff
projects / people / trikolon / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5479803)
fix core58 merge problem.
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 May 2012 21:21:18 +0000 (23:21 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 12 May 2012 17:30:30 +0000 (19:30 +0200)
Conflicts:

config/rootfiles/core/58/filelists/files

config/rootfiles/core/58/filelists/files patch | blob | blame | history

diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
index afb3d99699a10fd796893194442e5f366ef066c5..047127e7e540163ff1e298e2f6e55a09b7b68574 100644 (file)
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@ -1,3 +1,7 @@
 etc/system-release
 etc/issue
 etc/vimrc
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/general-functions.pl
+var/ipfire/langs
Ben's tree of IPFire 2.x.