diff options
| author | David Engster | 2014-11-27 18:22:00 +0100 |
|---|---|---|
| committer | David Engster | 2014-11-27 18:22:00 +0100 |
| commit | f42adad94bd8cf4f7a86bdced796bb88ec7e5bb2 (patch) | |
| tree | c7ac01d576897b14c47565e1eb4f7c5359e9cc0f /admin/ChangeLog | |
| parent | 9ec7bd97faa0085694377426ca4cca8593fa3606 (diff) | |
| download | emacs-f42adad94bd8cf4f7a86bdced796bb88ec7e5bb2.tar.gz emacs-f42adad94bd8cf4f7a86bdced796bb88ec7e5bb2.zip | |
admin: Add gitmerge.el
* gitmerge.el: New file.
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. |