aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/NEWS
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-05-29 20:50:12 +0200
committermarha <marha@users.sourceforge.net>2014-05-29 20:50:12 +0200
commitaec798fb4dc72d616732d0fa711faffaa8cd7590 (patch)
tree2814dfe69e7fb25b57492244d5cfa59d80fc8837 /xorg-server/xkeyboard-config/NEWS
parent78c6c2b88ae54977a2a617f116a1598657a98b6f (diff)
parent816a5430313e07083c5325f0a430126a2e10ec41 (diff)
downloadvcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.gz
vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.bz2
vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'xorg-server/xkeyboard-config/NEWS')
-rw-r--r--xorg-server/xkeyboard-config/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/NEWS b/xorg-server/xkeyboard-config/NEWS
index 05c89d145..b68820e85 100644
--- a/xorg-server/xkeyboard-config/NEWS
+++ b/xorg-server/xkeyboard-config/NEWS
@@ -1,3 +1,6 @@
+2.12 10 bugs fixed
+ More code cleanup
+ Translations updated
2.11 11 bugs fixed
Continuing code formatting cleanup
Translations updated