diff options
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 6d134046a38..c30e4bea5b6 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-11-27 David Engster <deng@randomsample.de> | ||
| 2 | |||
| 3 | * gitmerge.el: New file. | ||
| 4 | |||
| 1 | 2014-11-17 Oscar Fuentes <ofv@wanadoo.es> | 5 | 2014-11-17 Oscar Fuentes <ofv@wanadoo.es> |
| 2 | 6 | ||
| 3 | * admin/CPP-DEFINES: Mention MINGW_W64. | 7 | * admin/CPP-DEFINES: Mention MINGW_W64. |