summaryrefslogtreecommitdiff
path: root/src/Converters.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:30 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:30 +0000
commite1776973e1fbb3d6a0b043a3b34ff56c61416a7f (patch)
treec501bcce6e36b6d99cc6e190e446c076efe85f02 /src/Converters.c
parent2928a163b235d91385874aa6a1a6f893b045f606 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-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/Converters.c')
-rw-r--r--src/Converters.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Converters.c b/src/Converters.c
index 801279a..0cad630 100644
--- a/src/Converters.c
+++ b/src/Converters.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Converters.c,v 3.15 2003/05/27 22:26:42 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Converters.c,v 3.14tsi Exp $ */
/*