projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a2a235 ecc40d1)
Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 03:22:42 +0000 (23:22 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 03:22:42 +0000 (23:22 -0400)
1  2 
debian/changelog patch | diff1 | diff2 | blob | history

diff --cc debian/changelog
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.