chiark / gitweb /
~ian / chiark-tcl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: e31501d)
Merge branch 'dgit/sid'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 9 Nov 2014 12:19:50 +0000 (12:19 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 9 Nov 2014 12:23:08 +0000 (12:23 +0000)
Conflicts:
debian/changelog
debian/control

debian/changelog patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 5b97a5fe290ee97c8df3ab36e80617445f9ad88d..92284f3e03528698bc048837f6a47f02cea81060 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
 
  --
 
Unnamed repository; edit this file 'description' to name the repository.