summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2006-06-01 23:31:20 +0000
committerDaniel Stone <daniel@fooishbar.org>2006-06-01 23:31:20 +0000
commite9aebeae3661d4c464c7aa53722d0a6bf915101a (patch)
tree84986c66592f092881b1b93dc525158dbd81dfc5
parentf3886640d29026359ffc4add39b66b8ff48472d3 (diff)
Bug #6887: Add dead_stroke, bump to 7.0.7. (Troy Korjuslommi)
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--keysymdef.h1
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f419718..cc31659 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
2006-06-02 Daniel Stone <daniel@freedesktop.org>
* configure.ac:
- Bump to 7.0.6.
+ Bump to 7.0.6, and then to 7.0.7.
* keysym.h:
- * keysym.h:
+ * keysymdef.h:
Bug #6296: Add Braille keysyms. (Samuel Thibault)
+ * keysymdef.h:
+ Bug #6887: Add dead_stroke keysym. (Troy Korjuslommi)
+
2006-04-26 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 022bb91..04ad4f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
diff --git a/keysymdef.h b/keysymdef.h
index 09f55ef..dd9fbd9 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -380,6 +380,7 @@ SOFTWARE.
#define XK_dead_belowdot 0xfe60
#define XK_dead_hook 0xfe61
#define XK_dead_horn 0xfe62
+#define XK_dead_stroke 0xfe63
#define XK_First_Virtual_Screen 0xfed0
#define XK_Prev_Virtual_Screen 0xfed1