From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 9 Nov 2014 12:19:50 +0000 (+0000)
Subject: Merge branch 'dgit/sid'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=commitdiff_plain;h=43524bcbff468f7a21a351d4c5ac746649d82948

Merge branch 'dgit/sid'

Conflicts:
	debian/changelog
	debian/control
---

43524bcbff468f7a21a351d4c5ac746649d82948
diff --cc debian/changelog
index 1c0dec3,5b97a5f..92284f3
--- a/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.
  
   --