projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18d2403 c2a2f71)
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 22 Jul 2008 01:23:58 +0000 (21:23 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 22 Jul 2008 01:23:58 +0000 (21:23 -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.