]> 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: b24d097 adf6127)
Merge commit 'ms/toolchain-updates' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 5 Apr 2010 17:15:42 +0000 (19:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 5 Apr 2010 17:15:42 +0000 (19:15 +0200)
1  2 
naoki/__init__.py patch | diff1 | diff2 | blob | history
naoki/constants.py patch | diff1 | diff2 | blob | history
naoki/terminal.py patch | diff1 | diff2 | blob | history

diff --cc naoki/__init__.py
Simple merge
diff --cc naoki/constants.py
Simple merge
diff --cc naoki/terminal.py
Simple merge
IPFire 3.x development tree