summaryrefslogtreecommitdiff
path: root/debian/patches/series
diff options
context:
space:
mode:
authormartin f. krafft <madduck@debian.org>2009-05-05 13:46:19 +0200
committermartin f. krafft <madduck@debian.org>2009-05-05 13:46:19 +0200
commit9816f65676d22f741fd2e6053bff276a1da28547 (patch)
tree058da0dfcdc067e3a1e5f72fb5eee0529f8bc4ae /debian/patches/series
parent104c24eb5f8b501167e48dc57794d689ca0d78b9 (diff)
parent2b907e4bfa8aa3093e07aa74a62e203aafca5ec0 (diff)
Merge branch 'master' into debian/experimental
Conflicts: debian/changelog
Diffstat (limited to 'debian/patches/series')
-rw-r--r--debian/patches/series2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..6f4b6d73
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Fix-gcc-4.4-compiler-warning.patch -p1
+Makefile-use-CC-more-consistently.patch -p1