projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15ec55e f9b87a9)
Merge branch 'master' into comments
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 17 Dec 2008 19:06:57 +0000 (14:06 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 17 Dec 2008 19:06:57 +0000 (14:06 -0500)
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.