]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6402d2 046ac5f)
Merge branch 'dependency-types'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Oct 2009 19:15:54 +0000 (15:15 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Oct 2009 19:15:54 +0000 (15:15 -0400)
Conflicts:
doc/todo/dependency_types.mdwn

1  2 
doc/todo/dependency_types.mdwn patch | diff1 | diff2 | blob | history

diff --cc doc/todo/dependency_types.mdwn
Simple merge
Unnamed repository; edit this file 'description' to name the repository.