]> 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 | combined (merge: f4435fd 219c963)
Merge remote-tracking branch 'jiweigert/updxlrtr_sources' into core68
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Mar 2013 15:37:08 +0000 (16:37 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Mar 2013 15:37:08 +0000 (16:37 +0100)
1  2 
config/updxlrator/updxlrator patch | diff1 | diff2 | blob | history

diff --cc config/updxlrator/updxlrator
Simple merge
Peter's tree of IPFire 2.x