]> 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: bd34e32 0ee45bc)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Sat, 14 Jun 2014 07:41:59 +0000 (09:41 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Sat, 14 Jun 2014 07:41:59 +0000 (09:41 +0200)
1  2 
config/rootfiles/common/armv5tel/initscripts patch | diff1 | diff2 | blob | history
config/rootfiles/common/i586/initscripts patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/common/armv5tel/initscripts
index 2fffcf5267600d5d90c99900943bed23d8f02394,5d5c6920490f847f710759131c7dc78d5a91b445..0a1a81109d553a5def8f42f0f4ccc4cb3f32360e
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 a264267f865f258228ca05d9e141c97968989e22,fa3dbcdb8c279fde9251a03f510b031f61a49a7d..d48d6a51be6543cc703c9cccea57e2c38a2e5313
mode 100755,100644..100755
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
diff --cc make.sh
Simple merge
IPFire 2.x development tree