diff options
| author | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
| commit | 122f6df3259e8ca1dd96554d08cebce4b5c55acc (patch) | |
| tree | 2e1d6f54e62936792176caba483af8cc0907c755 /doc/git.mdwn | |
| parent | fb82474be06f1be2c96bdfc231c3768cabe0d4eb (diff) | |
| parent | 8b577726ab3768d50ca7d3fdef240e37fe046fc2 (diff) | |
Merge branch 'master' into prefix-directives
Conflicts:
debian/changelog
templates/change.tmpl
Diffstat (limited to 'doc/git.mdwn')
| -rw-r--r-- | doc/git.mdwn | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn index 90f030ab4..6cbc1e489 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -21,11 +21,14 @@ 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. + +* `prefix-directives` changes the preprocessor directive syntax. + Passes all test cases; pending merge. + * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some changes. * `pristine-tar` contains deltas that |