]> 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: fd073ae ea3224a)
Merge branch 'vdr-next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 30 Apr 2013 10:11:16 +0000 (12:11 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 30 Apr 2013 10:11:16 +0000 (12:11 +0200)
Conflicts:
config/rootfiles/core/68/filelists/files

1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
IPFire 2.x development tree