X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/11f4942d68f3276bfdc4688e4091e559f9481874..4bfdbd4858bc7842df97902e0bc9bd5d2bef861e:/doc/git.mdwn diff --git a/doc/git.mdwn b/doc/git.mdwn index 90f030ab4..8005dcf6e 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -21,11 +21,10 @@ own [[patches|patch]]. Some of the branches included in the main repository include: * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged - die to license issues. + due to license issues. Also some bits need to be tweaked to make it + work with the current *master* branch again. * `html` is an unfinished attempt at making ikiwiki output HTML 4.01 instead of xhtml. -* `prefix-directives` changes the preprocessor directive syntax. It - is approximately one failing test case away from merging. * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some changes. * `pristine-tar` contains deltas that