]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ce49ff 6c4319a)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Wed, 15 Oct 2014 20:38:13 +0000 (22:38 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Wed, 15 Oct 2014 20:38:13 +0000 (22:38 +0200)
1  2 
config/rootfiles/common/armv5tel/initscripts patch | diff1 | diff2 | blob | history
config/rootfiles/common/i586/initscripts patch | diff1 | diff2 | blob | history
lfs/initscripts patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/common/armv5tel/initscripts
index e856697b9ab71171f8791059000d45b50ff81b74,dfe2e4869e8e472a8fd725d18663c024158fa1ef..c761e2667234bd209602194014a2cf5e13e670f4
mode 100755,100644..100755
--- 1/config/rootfiles/common/armv5tel/initscripts
--- 2/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
diff --cc config/rootfiles/common/i586/initscripts
index af099ba69b7674055ea6812904fa1e5d107972f8,622886fd647f909dc2bb340b1ca5682642789a5e..525c55c455af95534d87963da0e307178cddcbe9
mode 100755,100644..100755
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
diff --cc lfs/initscripts
index 02f97431a2318186c57dbed65374451cf17141f1,4acf65e13eb965ae8673e0a40e72786a30d3a5c9..4acf65e13eb965ae8673e0a40e72786a30d3a5c9
mode 100755,100644..100755
--- 1/lfs/initscripts
--- 2/lfs/initscripts
+++ b/lfs/initscripts
diff --cc make.sh
Simple merge
IPFire 2.x development tree