summaryrefslogtreecommitdiff
path: root/src/add_window.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:17 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:17 +0000
commite8a005881cad65292bd73a2ed8f7454ce9d461f0 (patch)
tree4473b2c497e65c5d49f7a47642c4c711d54b3f8b /src/add_window.c
parent9071e4e92738e8eb23df35a2e58bce30ab59b4c9 (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).
Diffstat (limited to 'src/add_window.c')
-rw-r--r--src/add_window.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/add_window.c b/src/add_window.c
index 9b6a6c7..b9dd3ba 100644
--- a/src/add_window.c
+++ b/src/add_window.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/add_window.c,v 1.13 2003/08/04 10:32:30 eich Exp $ */
+/* $XFree86: xc/programs/twm/add_window.c,v 1.11 2002/04/04 14:05:58 eich Exp $ */
/*****************************************************************************/
/*