summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--doc/reference/tmpl/xklavier.sgml1
2 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b07f63..2e2ad76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,7 +47,6 @@
linking to xkbfile is also optional.
Thanks to Thomas Vander Stichele
->>>>>>> 1.44
2006-04-30 svu
* autogen.sh: fail on autoconf/automake errors,
diff --git a/doc/reference/tmpl/xklavier.sgml b/doc/reference/tmpl/xklavier.sgml
index 9af9b9a..48e22c2 100644
--- a/doc/reference/tmpl/xklavier.sgml
+++ b/doc/reference/tmpl/xklavier.sgml
@@ -89,6 +89,7 @@ Utility functions
@...:
@...:
@...:
+@...:
@...: