diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:50 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:50 +0000 |
| commit | 20240438ef9d3a6c66443ca9f095a2766ef6ed4e (patch) | |
| tree | 9e888341d75cb88280601363480df7c48d3defc8 /expr.c | |
| parent | a3729a9f9fcda07b233f434266148c8751684347 (diff) | |
Merging XORG-CURRENT into trunkXORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGE
Diffstat (limited to 'expr.c')
| -rw-r--r-- | expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,3 +1,4 @@ +/* $XdotOrg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */ /* $Xorg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.8 2003/12/18 14:14:37 pascal Exp $ */ +/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.7 2003/08/06 14:04:05 eich Exp $ */ #include "xkbcomp.h" #include "tokens.h" |