[geany/geany] 4d4573: Merge pull request #855 from techee/changelog

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 09 Jan 2016 19:18:29 UTC
Commit:      4d4573c5d88e1c10eff08e1bd304aa54084c48ce
             https://github.com/geany/geany/commit/4d4573c5d88e1c10eff08e1bd304aa54084c48ce

Log Message:
-----------
Merge pull request #855 from techee/changelog

Concatenate ChangeLog.pre-0-17 and ChangeLog.pre-1-22


Modified Paths:
--------------
    ChangeLog.pre-0-17
    ChangeLog.pre-1-22
    Makefile.am

Modified: ChangeLog.pre-0-17
12806 lines changed, 0 insertions(+), 12806 deletions(-)
===================================================================
No diff available, check online


Modified: ChangeLog.pre-1-22
12807 lines changed, 12806 insertions(+), 1 deletions(-)
===================================================================
No diff available, check online


Modified: Makefile.am
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -20,7 +20,6 @@ EXTRA_DIST = \
 	geany.desktop.in \
 	geany.pc.in \
 	geany.spec \
-	ChangeLog.pre-0-17 \
 	ChangeLog.pre-1-22 \
 	HACKING \
 	README.I18N \



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).