diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-02-10 02:11:05 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-02-10 02:11:05 -0500 |
| commit | 3a13c7508c4bda8340497e8ab9d03e56fb5ddc30 (patch) | |
| tree | 4fdd05077b096d502383df6068d5eacc1949d529 /doc | |
| parent | 122f6df3259e8ca1dd96554d08cebce4b5c55acc (diff) | |
| download | ikiwiki-3a13c7508c4bda8340497e8ab9d03e56fb5ddc30.tar ikiwiki-3a13c7508c4bda8340497e8ab9d03e56fb5ddc30.tar.gz | |
prefix-directives branch is merged so no need to list anymore
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git.mdwn | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn index 6cbc1e489..8005dcf6e 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -25,10 +25,6 @@ Some of the branches included in the main repository include: 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. - Passes all test cases; pending merge. - * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some changes. * `pristine-tar` contains deltas that |