1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 16047d3..5c8fe15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-25  Samuel Bronson  <naesten@gmail.com>
+
+	* .gitattributes: New file for use with git-merge-changelog.
+
 2014-07-21  Joel Sherrill  <joel.sherrill@oarcorp.com>
 
 	Disable gdb for or1k*-*-* until supported