diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:48 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:48 +0000 |
| commit | 5b4d069ffaf381a5af4d6a6a7d149b7c81f56562 (patch) | |
| tree | 3634ddfa7e693e2ed52f501349a194a55438b9ee | |
| parent | a5c1c59adca4ed5d7082524188f1170562ce3fa4 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
| -rw-r--r-- | src/xf86HyperPen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c index af3d4d6..9aa734d 100644 --- a/src/xf86HyperPen.c +++ b/src/xf86HyperPen.c @@ -35,7 +35,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/hyperpen/xf86HyperPen.c,v 1.10 2003/11/17 22:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/hyperpen/xf86HyperPen.c,v 1.9 2003/09/24 03:16:59 dawes Exp $ */ #include <xf86Version.h> |