]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac93c5d 27f2be1)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Mon, 6 Dec 2010 17:47:29 +0000 (18:47 +0100)
committerChristian Schmidt <maniacikarus@ipfire.org>
Mon, 6 Dec 2010 17:47:29 +0000 (18:47 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Timo's tree of IPFire 2.x