Merge branch 'dgit/sid'

author Ian Jackson <ijackson@chiark.greenend.org.uk>

Sun, 9 Nov 2014 12:19:50 +0000 (12:19 +0000)

committer Ian Jackson <ijackson@chiark.greenend.org.uk>

Sun, 9 Nov 2014 12:23:08 +0000 (12:23 +0000)
author Ian Jackson <ijackson@chiark.greenend.org.uk>
Sun, 9 Nov 2014 12:19:50 +0000 (12:19 +0000)
committer Ian Jackson <ijackson@chiark.greenend.org.uk>
Sun, 9 Nov 2014 12:23:08 +0000 (12:23 +0000)
diff --cc debian/changelog

index 1c0dec36ba0ad45f6a55b4c55471fac7bc80c550,5b97a5fe290ee97c8df3ab36e80617445f9ad88d..92284f3e03528698bc048837f6a47f02cea81060
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,6 +1,7 @@@
   chiark-tcl (1.1.2~) unstable; urgency=low
   
+   * Reintroduce .gitignore which a build tool brokenly deleted.
+ +  * Remove .cvsignore files from git repo.
   
    --
author	Ian Jackson <ijackson@chiark.greenend.org.uk>
	Sun, 9 Nov 2014 12:19:50 +0000 (12:19 +0000)
committer	Ian Jackson <ijackson@chiark.greenend.org.uk>
	Sun, 9 Nov 2014 12:23:08 +0000 (12:23 +0000)