projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6b7dc3 66e894c)
Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 17:36:40 +0000 (13:36 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 17:36:40 +0000 (13:36 -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.