diff options
author | marha <marha@users.sourceforge.net> | 2010-01-20 11:12:52 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-01-20 11:12:52 +0000 |
commit | 439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9 (patch) | |
tree | 793fbb8e2a3630ba56a145f784cbe134800316e7 /libX11/src/xkb/XKBSetMap.c | |
parent | 8bbcd844049eb1296ccd25aca75bf3b08f28facb (diff) | |
parent | a9768b035f2c47be0908520474073cc68d225d8a (diff) | |
download | vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.gz vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.bz2 vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.zip |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src/xkb/XKBSetMap.c')
-rw-r--r-- | libX11/src/xkb/XKBSetMap.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libX11/src/xkb/XKBSetMap.c b/libX11/src/xkb/XKBSetMap.c index d513c49ce..bd46e1fc7 100644 --- a/libX11/src/xkb/XKBSetMap.c +++ b/libX11/src/xkb/XKBSetMap.c @@ -1,4 +1,3 @@ -/* $Xorg: XKBSetMap.c,v 1.4 2000/08/17 19:45:03 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBSetMap.c,v 3.2 2001/01/17 19:41:49 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> |