![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Fri, 29 May 2009 13:01:57 +0000 (15:01 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Fri, 29 May 2009 13:01:57 +0000 (15:01 +0200) |
| 1 | 2 | |||
|---|---|---|---|---|
| debian/changelog | patch | | diff1 | | diff2 | | blob | history |
| debian/control | patch | | diff1 | | diff2 | | blob | history |
| debian/copyright | patch | | diff1 | | diff2 | | blob | history |
| debian/patches/00list | patch | | diff1 | | diff2 | | blob | history |
| debian/rules | patch | | diff1 | | diff2 | | blob | history |
diff --cc debian/changelog
Simple merge
diff --cc debian/control
Simple merge
diff --cc debian/copyright
Simple merge
diff --cc debian/patches/00list
index 1a38c72d142aab8765839b08d573667c61486fa1,332b35c8333c22b54c6ead8e9d0f6750c3bfbc7f..16268ce36610a2b02cb3f5db03f9528a501db3ed
+++ b/debian/patches/00list
rrd_filter_path.dpatch
collection_conf_path.dpatch
- battery_acpi_complain.dpatch
- ntpd_type_pun_fix.dpatch
+include_empty_files.dpatch
diff --cc debian/rules
Simple merge