diff options
author | Ciaran McCreesh <ciaran.mccreesh@googlemail.com> | 2008-04-24 19:44:08 +0100 |
---|---|---|
committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com> | 2008-04-24 19:44:08 +0100 |
commit | c29a277be3eec6b4dd3afee0d71697dd6e07f209 (patch) | |
tree | e65bbf86229066c37c09d9a8c35c9a5f27506979 /pms.tex | |
parent | Merge branch 'historical-curiosities' (diff) | |
download | pms-c29a277be3eec6b4dd3afee0d71697dd6e07f209.tar.gz pms-c29a277be3eec6b4dd3afee0d71697dd6e07f209.tar.bz2 pms-c29a277be3eec6b4dd3afee0d71697dd6e07f209.zip |
Document the merge process, take 2
Diffstat (limited to 'pms.tex')
-rw-r--r-- | pms.tex | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -126,7 +126,7 @@ \include{ebuild-environment} -\include{config-protection} +\include{merge} \include{glossary} |