aboutsummaryrefslogtreecommitdiffstats
path: root/help/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'help/ChangeLog')
-rw-r--r--help/ChangeLog2
1 files changed, 0 insertions, 2 deletions
diff --git a/help/ChangeLog b/help/ChangeLog
index dc34126b4c..e88fca6898 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -283,12 +283,10 @@
* C/preface.sgml: Spelling fixes, etc.
-=======
2000-09-19 Federico Mena Quintero <federico@helixcode.com>
* C/Makefile.am: Fixed to install the stylesheet-images as well.
->>>>>>> 1.26
2000-09-07 Aaron Weber <aaron@helixcode.com>
* C/fig/ New files: contact-editor.png, mail-composer.png,
git/freebsd-ports-gnome/log/net?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438'>net/grilo-plugins
Commit message (Expand)AuthorAgeFilesLines
* Split devel/gettext in devel/gettext-runtime and devel/gettext-tools. Thetijl2014-11-301-1/+1