summaryrefslogtreecommitdiff
path: root/changelog
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-11-17 14:27:32 +0000
committerMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-11-17 14:27:32 +0000
commit2631cb04f16bbb266d70701ba409bdca8508cb97 (patch)
tree6dbf5cdd52b520e00863513ac65bcd2cfe5e2bdc /changelog
parent3c05f3dbc963d426c2189f52f68c98abb13c7bee (diff)
parentf1a9ec0f79eb66eda93c62c9b04360f62d1a7b79 (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/dbus/dbus-java
Conflicts: changelog
Diffstat (limited to 'changelog')
-rw-r--r--changelog3
1 files changed, 2 insertions, 1 deletions
diff --git a/changelog b/changelog
index 926e4d3..7813f73 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,8 @@ Version 1.12:
Version 1.11:
- * fix bugs for debian packaging, split install targets
+ * fix script replacement directories to be different to install directories
+ * split install-doc and install-man to allow easy split -doc package
Version 1.10: