]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fd18fc 0458020)
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 6 Sep 2009 23:41:08 +0000 (01:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 6 Sep 2009 23:41:08 +0000 (01:41 +0200)
1  2 
src/bash/bashrc patch | diff1 | diff2 | blob | history

diff --cc src/bash/bashrc
Simple merge
IPFire 3.x development tree