projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bcd6cc 4449a70)
Merge remote branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Sun, 18 Jul 2010 23:35:16 +0000 (19:35 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 18 Jul 2010 23:35:16 +0000 (19:35 -0400)
1  2 
IkiWiki.pm patch | diff1 | diff2 | blob | history
doc/plugins/po.mdwn patch | diff1 | diff2 | blob | history

diff --cc IkiWiki.pm
Simple merge
diff --cc doc/plugins/po.mdwn
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.