summaryrefslogtreecommitdiff
path: root/xkb/XKBMAlloc.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:54:16 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:54:16 +0000
commit0664db19bf37f9dd69cca6adff4e238e310c3092 (patch)
treed2cc9d3132d40796018a853df38877fa5b027f18 /xkb/XKBMAlloc.c
parent9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'xkb/XKBMAlloc.c')
-rw-r--r--xkb/XKBMAlloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 20def46ba..d1fd14f27 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.12 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.11 2001/01/17 19:41:48 dawes Exp $ */
#ifndef XKB_IN_SERVER