summaryrefslogtreecommitdiffstats
path: root/xorg-data/xkeyboard-config/HISTORY
diff options
context:
space:
mode:
authorEric Sandall2011-08-24 11:12:02 -0700
committerEric Sandall2011-08-24 11:12:02 -0700
commit4df120d89abbe077f79de4acf8932a9a79842bbc (patch)
tree2f4f8e62dc451c4fb032ec0b0545d9fd1f940697 /xorg-data/xkeyboard-config/HISTORY
parent2a53931f090a4a7f218f7f2a29aa55b22a2b4473 (diff)
parent590e9457a5b4741e69b9956983fdf68d74adb073 (diff)
Merge branch 'master' into devel-xorg-modular
Conflicts: xorg-data/xkeyboard-config/BUILD xorg-data/xkeyboard-config/HISTORY
Diffstat (limited to 'xorg-data/xkeyboard-config/HISTORY')
-rw-r--r--xorg-data/xkeyboard-config/HISTORY3
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY
index 3f71d2a4df..3f5f6735b5 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor@ver.si>
+ * BUILD: commented unrecognized option (issue #30)
+
2011-04-25 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 2.2.1
2.2.x requires libx11 1.4.3+