projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fa0cfc 4e7e4e4)
Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 22:04:52 +0000 (18:04 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 22:04:52 +0000 (18:04 -0400)
1  2 
doc/todo/dependency_types.mdwn patch | diff1 | diff2 | blob | history

diff --cc doc/todo/dependency_types.mdwn
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.