1commit ff688ceacaddb8e2f345caadfe33e408d97782a0
2Author: Alan Coopersmith <alan.coopersmith@oracle.com>
3Date:   Sat Jun 3 10:40:03 2023 -0700
4
5    xrdb 1.2.2
6    
7    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
8
9commit 6085098c95847f1f9f13d26f2adc7518fabf3b24
10Author: Alan Coopersmith <alan.coopersmith@oracle.com>
11Date:   Mon Feb 6 13:13:21 2023 -0800
12
13    configure: raise minimum autoconf requirement to 2.70
14    
15    Needed for builds on NetBSD to work correctly, since it depends on
16    AC_USE_SYSTEM_EXTENSIONS defining _OPENBSD_SOURCE to expose the
17    prototype for reallocarray() in the system headers.
18    
19    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
20
21commit edcda53f9e66afadd871c23793e021e9725b4d6b
22Author: Alan Coopersmith <alan.coopersmith@oracle.com>
23Date:   Sun Nov 13 10:48:30 2022 -0800
24
25    Fallback asprintf: don't truncate output that has a \0 in string
26    
27    Unlikely to be hit in xrdb, but may affect other uses if this code
28    gets copied to other programs.
29    
30    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
31
32commit 496bdd684935b9b7156222fec7009e8aa4a8dbad
33Author: Alan Coopersmith <alan.coopersmith@oracle.com>
34Date:   Sun Nov 13 10:44:17 2022 -0800
35
36    Rename variable 'dup' to avoid shadowing dup() function
37    
38    As recommended by cppcheck
39    
40    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
41
42commit da0bcc8b8746cd3eb93f20d61145edc6a1040dda
43Author: Alan Coopersmith <alan.coopersmith@oracle.com>
44Date:   Sun Nov 13 10:41:14 2022 -0800
45
46    Use C99 struct initialization
47    
48    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
49
50commit 0ac060079060419bdfc4e54ba1a8643cffa1d7d3
51Author: Alan Coopersmith <alan.coopersmith@oracle.com>
52Date:   Sun Nov 13 10:34:27 2022 -0800
53
54    Variable scope reduction as recommended by cppcheck
55    
56    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
57
58commit e7db9aa5f73904c243201d4c52e4b157ded05af7
59Author: Alan Coopersmith <alan.coopersmith@oracle.com>
60Date:   Thu Jul 28 17:30:21 2022 -0700
61
62    gitlab CI: stop requiring Signed-off-by in commits
63    
64    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
65
66commit 1e20d715f2a064993a1b83b49d2f355d0ef9c56b
67Author: Alan Coopersmith <alan.coopersmith@oracle.com>
68Date:   Tue Dec 7 13:55:05 2021 -0800
69
70    Build xz tarballs instead of bzip2
71    
72    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
73
74commit 70d96ac2b99c5ebc959c4baf9a32760c41c0e440
75Author: Alan Coopersmith <alan.coopersmith@oracle.com>
76Date:   Tue Dec 7 13:55:02 2021 -0800
77
78    gitlab CI: add a basic build test
79    
80    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
81
82commit 9c3a19e3f13252c6ac5b02ce703531b2bf9f7463
83Author: Matthieu Herrb <matthieu.herrb@laas.fr>
84Date:   Mon Aug 9 19:31:28 2021 +0200
85
86    xrdb 1.2.1
87    
88    Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
89
90commit 4d3c11bee8c81abbc033a4731648a88db14508e1
91Author: Walter Harms <wharms@bfs.de>
92Date:   Sat Jun 26 23:11:25 2021 +0200
93
94    fix assignment discards ‘const’ qualifier
95    
96    xrdb.c: In function ‘main’:
97    xrdb.c:1071:52: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
98                         cmd_defines[num_cmd_defines++] = "-undef";
99    
100    Signed-off-by: Walter Harms <wharms@bfs.de>
101
102commit 7d69c7f52b83a9b732325a16603b22e6c2f15d93
103Author: Walter Harms <wharms@bfs.de>
104Date:   Sat Jun 26 23:06:23 2021 +0200
105
106    XFree() can handle NULL arg
107    
108    Signed-off-by: Walter Harms <wharms@bfs.de>
109
110commit 2c57bc85c4cea7a159985a446e1f5f61a4c0f139
111Author: Walter Harms <wharms@bfs.de>
112Date:   Sat Jun 26 22:55:46 2021 +0200
113
114    Add actual querying capabilities
115    
116    The world is littered with broken grep commands because `xrdb -query`
117    can only dump the database and doesn't implement this simple search
118    feature. This patch adds a new `-get` option to search and print the
119    content of a single property by name.
120    
121    Signed-off-by: Michele Guerini Rocco <rnhm...@inventati.org>
122    Reviewed-by:  Walter Harms <wharms@bfs.de>
123    Signed-off-by: Walter Harms <wharms@bfs.de>
124
125commit 9c51a2829f65ea03ef87376ca9561037d9262f6d
126Author: Tobias Stoeckmann <tobias@stoeckmann.org>
127Date:   Sun Jun 7 19:56:43 2020 +0200
128
129    Fix out of boundary read.
130    
131    If a binary file which starts with 0x00 is edited, xrdb performs
132    an off-by-one read outside of its buffer.
133    
134    The fix is simple: Do not try to append an empty string to buffer,
135    which would be a no-op anyway.
136    
137    Proof of Concept (compile with -fsanitize=address):
138    
139    $ dd if=/dev/zero bs=1 count=1 of=poc.txt
140    $ xrdb -edit poc.txt
141    
142    Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
143
144commit c281cadb06657c2a15a52598be6cf9c30fad1b12
145Author: Alan Coopersmith <alan.coopersmith@oracle.com>
146Date:   Tue Feb 19 15:43:17 2019 -0800
147
148    xrdb 1.2.0
149    
150    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
151
152commit 3153fa6c79a2887ee63a58ae6a7d9f17d1615cb8
153Author: Alan Coopersmith <alan.coopersmith@oracle.com>
154Date:   Wed Nov 21 17:17:21 2018 -0800
155
156    Update configure.ac bug URL for gitlab migration
157    
158    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
159
160commit e0026511c78a1bab57a6087b923bb223edc90282
161Author: Alan Coopersmith <alan.coopersmith@oracle.com>
162Date:   Fri Nov 16 22:49:16 2018 -0800
163
164    Update README for gitlab migration
165    
166    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
167
168commit 4c01ea85005fbc3506e32b88e1db3186538f8b9a
169Author: Alan Coopersmith <alan.coopersmith@oracle.com>
170Date:   Sat Mar 24 23:24:46 2018 -0700
171
172    Add -E flag to show cpp command line & processed input file
173    
174    https://bugs.freedesktop.org/show_bug.cgi?id=98300
175    
176    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
177
178commit 74e8f61bd2f6857b8f242ffd34b3fe0ba1a04aa9
179Author: Alan Coopersmith <alan.coopersmith@oracle.com>
180Date:   Fri Mar 9 18:28:18 2018 -0800
181
182    xrdb 1.1.1
183    
184    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
185
186commit ae86081a92522653ff1523c92524ff892f75d496
187Author: Mihail Konev <k.mvc@ya.ru>
188Date:   Thu Jan 26 14:00:21 2017 +1000
189
190    autogen: add default patch prefix
191    
192    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
193
194commit b8909fc97335fae5bffa43914379787b27171b17
195Author: Emil Velikov <emil.l.velikov@gmail.com>
196Date:   Mon Mar 9 12:00:52 2015 +0000
197
198    autogen.sh: use quoted string variables
199    
200    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
201    fall-outs, when they contain space.
202    
203    Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
204    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
205    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
206
207commit d65dc2a5fe6566b13c4b4a55f7d6977365ad1865
208Author: Peter Hutterer <peter.hutterer@who-t.net>
209Date:   Tue Jan 24 10:32:07 2017 +1000
210
211    autogen.sh: use exec instead of waiting for configure to finish
212    
213    Syncs the invocation of configure with the one from the server.
214    
215    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
216    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
217
218commit 3ae3e2f9d2b86fc3808a4631f79b6087bd1a81a4
219Author: Alan Coopersmith <alan.coopersmith@oracle.com>
220Date:   Fri Apr 24 00:25:04 2015 -0700
221
222    Use reallocarray() for array allocations & resizing
223    
224    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
225    Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
226
227commit b21b44b214e9f4728665fcfd13da6e43ee93069a
228Author: Alan Coopersmith <alan.coopersmith@oracle.com>
229Date:   Fri Apr 24 00:11:47 2015 -0700
230
231    Fix "editting" typo in comment
232    
233    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
234
235commit 843b15fc3c3be5effef78fe6b5abaa11788f0908
236Author: Alan Coopersmith <alan.coopersmith@oracle.com>
237Date:   Fri Apr 24 00:09:18 2015 -0700
238
239    Reformat code to X.Org standard coding style
240    
241    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
242
243commit 8b8d03f970115df28232c588b585d3751f1780fb
244Author: Alan Coopersmith <alan.coopersmith@oracle.com>
245Date:   Sat Nov 8 09:24:04 2014 -0800
246
247    Use SEEK_* names instead of raw numbers for fseek whence argument
248    
249    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
250
251commit ae495ec8de483ab99fe51bb36b95af4f50973387
252Author: Alan Coopersmith <alan.coopersmith@oracle.com>
253Date:   Tue Jun 3 22:45:20 2014 -0700
254
255    Print which option was in error along with usage message
256    
257    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
258
259commit 01a023d7078f3325f626e8d499307b0d92eef64d
260Author: Alan Coopersmith <alan.coopersmith@oracle.com>
261Date:   Tue Jun 3 22:28:54 2014 -0700
262
263    unifdef -U__UNIXOS2__
264    
265    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
266
267commit 8a051c45632ee88a4ca0ca492fe8c5cae4b71299
268Author: Alan Coopersmith <alan.coopersmith@oracle.com>
269Date:   Tue Jun 3 22:27:10 2014 -0700
270
271    Stop casting free() arguments to (char *)
272    
273    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
274
275commit 7a464b04727516775c0a23325a2c69ba1357b00d
276Author: Alan Coopersmith <alan.coopersmith@oracle.com>
277Date:   Tue Jun 3 22:24:40 2014 -0700
278
279    Clean up sign/size conversion warnings from clang
280    
281    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
282
283commit 074f6439a8606d9d191280ccffb37daa3c15e868
284Author: Alan Coopersmith <alan.coopersmith@oracle.com>
285Date:   Tue Jun 3 20:16:28 2014 -0700
286
287    Remove unused macro RESOURCE_PROPERTY_NAME
288    
289    Flagged by clang:
290    xrdb.c:92:9: warning: macro is not used [-Wunused-macros]
291            ^
292    
293    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
294
295commit 118f7d099b99432d7f7013ae51de85b9561ee413
296Author: Alan Coopersmith <alan.coopersmith@oracle.com>
297Date:   Tue Jun 3 20:13:28 2014 -0700
298
299    configure: add more m4 quoting to quiet autoconf complaints
300    
301    Gets rid of these warnings:
302    configure.ac:54: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
303    ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
304    ../../lib/autoconf/general.m4:2591: _AC_COMPILE_IFELSE is expanded from...
305    ../../lib/autoconf/general.m4:2607: AC_COMPILE_IFELSE is expanded from...
306    configure.ac:54: the top level
307    configure.ac:61: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
308    ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
309    ../../lib/autoconf/general.m4:2591: _AC_COMPILE_IFELSE is expanded from...
310    ../../lib/autoconf/general.m4:2607: AC_COMPILE_IFELSE is expanded from...
311    configure.ac:61: the top level
312    
313    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
314
315commit 6699bfcb0bcc148a4659c5c2434594a6e7fbe757
316Author: Alan Coopersmith <alan.coopersmith@oracle.com>
317Date:   Tue Jun 3 18:47:31 2014 -0700
318
319    autogen.sh: Honor NOCONFIGURE=1
320    
321    See http://people.gnome.org/~walters/docs/build-api.txt
322    
323    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
324
325commit 1b1793b6bc469415b152918204dbc9e999e9815e
326Author: Alan Coopersmith <alan.coopersmith@oracle.com>
327Date:   Tue Jun 3 18:47:31 2014 -0700
328
329    configure: Drop AM_MAINTAINER_MODE
330    
331    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
332
333commit 17eda976c8dca736ef63fc45ff7de8c73c0e2936
334Author: Alan Coopersmith <alan.coopersmith@oracle.com>
335Date:   Sun Sep 8 10:16:42 2013 -0700
336
337    xrdb 1.1.0
338    
339    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
340
341commit 4e49a64191d3b08044d29d32896e15013e5e7540
342Author: Alan Coopersmith <alan.coopersmith@oracle.com>
343Date:   Fri Jul 19 19:51:09 2013 -0700
344
345    Add -version flag to print package version string from autoconf
346    
347    Also adds missing entry for -help flag to usage message.
348    
349    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
350    Reviewed-By: Matt Dew <marcoz@osource.org>
351
352commit ec7b273fd135a14a2ca6c19cd0e6afe1536db552
353Author: Alan Coopersmith <alan.coopersmith@oracle.com>
354Date:   Fri Jul 19 19:31:04 2013 -0700
355
356    Only add -P flag if using cpp as our preprocessor
357    
358    Restores ability to use m4 (broken in xrdb-1.0.8 by commit 117021570515f)
359    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=34546
360    
361    Reviewed-by: <wharms@bfs.de>
362    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
363
364commit 11e7f4610cd6468aeea115081dd72ddd7eba0f3f
365Author: Matthieu Herrb <matthieu.herrb@laas.fr>
366Date:   Fri Dec 3 15:52:04 2010 -0500
367
368    predefined cpp macros can produce unexpected results (bug 3413)
369    
370    GNU cpp is predefining a number of symbols, depending on the host and target
371    architecture. This can produce some unexpected results: for example, the
372    expansion of CLIENTHOST if the host name is i386.my.domain.
373    
374    The attached patch creates a new -undef option to xrdb that is passed to
375    cpp.
376    
377    Acked-by: Gaetan Nadon <memsize@videotron.ca>
378    Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
379    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
380
381commit d23e17e09c45e214737ddf8f653dc31cdcf3a0d2
382Author: Alan Coopersmith <alan.coopersmith@oracle.com>
383Date:   Sat Jul 6 18:53:49 2013 -0700
384
385    Rename args to several functions to not shadow global variables
386    
387    Renamed "buffer" to "b" and "dpy" to "display" to match common patterns
388    in other functions in xrdb.c
389    
390    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
391
392commit 4b8da0a0a296dce4ead1baac4a39ac27dee144da
393Author: Alan Coopersmith <alan.coopersmith@oracle.com>
394Date:   Sat Jul 6 18:44:47 2013 -0700
395
396    Mark fatal() & Syntax() with printf & noreturn attributes
397    
398    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
399
400commit 45909ffe71788d80b2dabff886341b44c10a096d
401Author: Alan Coopersmith <alan.coopersmith@oracle.com>
402Date:   Sat Jul 6 18:42:28 2013 -0700
403
404    Strip trailing whitespace
405    
406    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
407
408commit ce7d8d3eaab2a5392c24ba3cca79b6fd1610abcb
409Author: Alan Coopersmith <alan.coopersmith@oracle.com>
410Date:   Sat Jul 6 18:41:19 2013 -0700
411
412    Remove unnecessary casts from malloc & realloc calls
413    
414    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
415
416commit 49022f26d97786b8252f9782d1517c6bf763e008
417Author: Alan Coopersmith <alan.coopersmith@oracle.com>
418Date:   Sat Jul 6 18:37:44 2013 -0700
419
420    Fix many const pointer warnings
421    
422    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
423
424commit 965ef4b3357a1dbf996529d98e812069878e07c4
425Author: Alan Coopersmith <alan.coopersmith@oracle.com>
426Date:   Sat Jul 6 12:02:23 2013 -0700
427
428    Ensure we don't read out of ClassName array bounds for unknown visual type
429    
430    Should never happen, but has been reported as happening at least once:
431    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488535
432    
433    Instead prints warning messages to stderr to help diagnose where the
434    bad visual information is coming from.
435    
436    (Tested by temporarily commenting out names in the ClassName array.)
437    
438    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
439
440commit ed086df97fc816dfeb792ac0094eaa8795177bf5
441Author: Alan Coopersmith <alan.coopersmith@oracle.com>
442Date:   Sun Jun 30 09:11:12 2013 -0700
443
444    Clarify .Xresources vs. .Xdefaults in man page
445    
446    Reported by John Feuerstein at
447    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649187
448    
449    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
450
451commit 420347005ccf1886dfbb2eb2902beafdcf4e2477
452Author: Egbert Eich <eich@freedesktop.org>
453Date:   Thu May 19 11:35:25 2011 +0200
454
455    Allow the CPP macro to contain preprocessors with command line options (v2)
456    
457    The preprocessor used for xrdb may require a command line option to
458    produce the desired output. For the GNU cpp this could be
459    'traditional-cpp' which may not be valid for other preprocessors.
460    Therefore support the specification of preprocessors along with
461    required command line arguments when using the '--with-cpp' configure
462    option.
463    Example:
464       ./configure --with-cpp="/usr/bin/cpp --traditional-cpp, /usr/lib/cpp".
465    
466    v2: Followed a suggestion by Julien Cristau <jcristau@debian.org>
467        to allocate memory for the dup string dynamically instead of
468        using a static buffer.
469    
470    Signed-off-by: Egbert Eich <eich@freedesktop.org>
471
472commit 76f2c5b2a744587a9e97b622ab359d6fd7689604
473Author: Egbert Eich <eich@freedesktop.org>
474Date:   Thu May 19 11:29:57 2011 +0200
475
476    Usage: In usage message print preprocessor that's actually chosen.
477    
478    The CPP macro may contain a list of preprocessors to chose from.
479    In the usage message describing the -cpp command line option print
480    the preprocessor that would actually be chosen.
481    
482    Signed-off-by: Egbert Eich <eich@freedesktop.org>
483    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
484
485commit 58349f9efc204f5843cfeccc25fbc51f1f5029ae
486Author: Jon TURNEY <jon.turney@dronecode.org.uk>
487Date:   Wed Jan 4 19:00:03 2012 +0000
488
489    Fix build with WIN32 defined, but PATHETICCPP not defined
490    
491    (Note that PATHETICCPP seems to be never defined now, see [1])
492    
493    [1] http://lists.x.org/archives/xorg-devel/2010-October/013860.html
494    
495    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
496    Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
497
498commit 60577129058e018f13748b99e51ab1a17088db8e
499Author: Alan Coopersmith <alan.coopersmith@oracle.com>
500Date:   Thu Jun 16 15:38:17 2011 -0700
501
502    Tokenize #define names in the PATHETICCPP case too
503    
504    Fixes generation of the EXT_<extension-name> #defines, since cpp treats
505    a #define EXT_MIT-SHM as a token "EXT_MIT" with a value of "-SHM".
506    
507    Without this fix, an xrdb built with PATHETICCPP prints warnings of:
508    macro EXT_XC redefines previous macro at "", line 27
509    macro EXT_XVideo redefines previous macro at "", line 33
510    macro EXT_MIT redefines previous macro at "", line 35
511    macro EXT_MIT redefines previous macro at "", line 37
512    
513    due to extension #defines such as EXT_MIT-SCREEN-SAVER & EXT_MIT-SHM
514    conflicting with each other.
515    
516    Now matches the non-PATHETICCPP handling of #define names.
517    
518    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
519
520commit 4b8990ea599aee08284481b258cccdc25dd5d8d8
521Author: Matthias Hopf <mhopf@suse.de>
522Date:   Tue Apr 5 17:50:00 2011 +0200
523
524    Bump to 1.0.9
525
526commit 1027d5df07398c1507fb1fe3a9981aa6b4bc3a56
527Author: Matthias Hopf <mhopf@suse.de>
528Date:   Tue Mar 1 19:37:34 2011 +0100
529
530    Create shell-escape-safe cpp options in the non-pathetic-cpp case.
531    
532    Fixes CVE-2011-0465.
533    
534    Signed-off-by: Matthias Hopf <mhopf@suse.de>
535    Reviewed-by: Adam Jackson <ajax@redhat.com>
536
537commit ce9709b2811eb06bc7e03d26599c40b60effd0f8
538Author: Jeremy Huddleston <jeremyhu@apple.com>
539Date:   Wed Feb 2 15:30:45 2011 -0800
540
541    xrdb 1.0.8
542    
543    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
544
545commit 649faef32416e6d87ec2dcad5b0142d3b7ff04d7
546Author: Jeremy Huddleston <jeremyhu@apple.com>
547Date:   Wed Feb 2 11:30:36 2011 -0800
548
549    Properly honor -nocpp
550    
551    Previously, if the user passed -nocpp and there was a cpp present,
552    cpp would be used.  This patch fixes that case.
553    
554    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
555    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
556
557commit 8a59f14ff4a87b96ce763dd6565d776f8ac3b087
558Author: Gaetan Nadon <memsize@videotron.ca>
559Date:   Wed Jan 19 10:06:56 2011 -0500
560
561    config: move man pages into their own directory
562    
563    Use services provided by XORG_MANPAGE_SECTIONS.
564    Use standard Makefile for man pages.
565    
566    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
567
568commit bc64aa2a2481130a02bfe41523863b7006d0c3a9
569Author: Gaetan Nadon <memsize@videotron.ca>
570Date:   Thu Jan 13 11:15:48 2011 -0500
571
572    man: remove trailing spaces and tabs
573    
574    Using s/[ \t]*$//
575    
576    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
577
578commit 64c9786971d2473d0334bbdbe1a5f79f29eb988f
579Author: Gaetan Nadon <memsize@videotron.ca>
580Date:   Wed Jan 12 15:29:50 2011 -0500
581
582    config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
583    
584    This silences an Automake warning.
585    
586    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
587
588commit 117021570515fa985670f78d27376d636ed5490f
589Author: Ulrich Mueller <ulm@gentoo.org>
590Date:   Wed Jan 5 13:31:36 2011 -0800
591
592    Call C preprocessor with -P option due to changed behaviour in GCC 4.5
593    
594    http://bugs.freedesktop.org/show_bug.cgi?id=32701
595    http://bugs.gentoo.org/show_bug.cgi?id=347758
596    
597    Signed-off-by: Ulrich Mueller <ulm@gentoo.org>
598    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
599
600commit 44c65a03644b1c297ee84ff1aa4b7790caa5da0b
601Author: Alan Coopersmith <alan.coopersmith@oracle.com>
602Date:   Tue Jan 4 20:29:09 2011 -0800
603
604    Merge usage() printf() strings/calls into a single string/call
605    
606    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
607    Reviewed-by: Julien Cristau <jcristau@debian.org>
608
609commit 82babf3ecfd6eb1ef65a150fb0c453e7bfd61616
610Author: Alan Coopersmith <alan.coopersmith@oracle.com>
611Date:   Tue Jan 4 20:20:11 2011 -0800
612
613    Replace complex malloc calculations with asprintf()
614    
615    Includes simple local implemenation of asprintf if configure doesn't
616    find one in system libraries.
617    
618    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
619    Reviewed-by: Julien Cristau <jcristau@debian.org>
620    Reviewed-by: Guillem Jover <guillem@hadrons.org>
621
622commit b9aa83d7868e8813098bbc62adf82a79dc62e14e
623Author: Alan Coopersmith <alan.coopersmith@oracle.com>
624Date:   Tue Jan 4 19:50:06 2011 -0800
625
626    Convert HAS_MKSTEMP to autoconf standard HAVE_MKSTEMP
627    
628    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
629    Reviewed-by: Julien Cristau <jcristau@debian.org>
630    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
631
632commit 6606863fc8467bcbc829cea63764be0d283c4b8a
633Author: Alan Coopersmith <alan.coopersmith@oracle.com>
634Date:   Wed Nov 10 19:32:04 2010 -0800
635
636    xrdb 1.0.7
637    
638    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
639
640commit 3a1f0f784bfd537096d4d37a77b7be7904bb88aa
641Author: Alan Coopersmith <alan.coopersmith@oracle.com>
642Date:   Tue Nov 9 16:26:45 2010 -0800
643
644    config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
645    
646    Regroup AC statements under the Autoconf initialization section.
647    Regroup AM sttaements under the Automake initialization section.
648    Add missing AC_CONFIG_SRCDIR
649    
650    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
651
652commit 4139da28b7c9bb5bd35933e28a6f0f6e325d921e
653Author: Alan Coopersmith <alan.coopersmith@oracle.com>
654Date:   Tue Nov 9 16:25:38 2010 -0800
655
656    config: Remove unnecessary calls from configure.ac
657    
658    AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
659    PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
660    
661    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
662
663commit a6ca7c4c8b330bfd8a1a225afe826d7dbfa820fb
664Author: Alan Coopersmith <alan.coopersmith@oracle.com>
665Date:   Tue Nov 9 16:24:37 2010 -0800
666
667    config: upgrade to util-macros 1.8 for additional man page support
668    
669    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
670    The value of MAN_SUBST is the same for all X.Org packages.
671    
672    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
673    Enables use of platform appropriate version of sed.
674    
675    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
676
677commit 0720655ecd3c8f3bc8c8bcb97863c02d73cae674
678Author: Gaetan Nadon <memsize@videotron.ca>
679Date:   Tue Nov 9 16:24:08 2010 -0800
680
681    config: update AC_PREREQ statement to 2.60
682    
683    Unrelated to the previous patches, the new value simply reflects
684    the reality that the minimum level for autoconf to configure
685    all x.org modules is 2.60 dated June 2006.
686    
687    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
688    
689    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
690    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
691
692commit da50b50cc1befae114dd8f9ce67b2aa034bcedf3
693Author: Jesse Adkins <jesserayadkins@gmail.com>
694Date:   Tue Sep 28 13:29:50 2010 -0700
695
696    Purge cvs tags.
697    
698    Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
699    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
700
701commit 532959ec60149589a72f027d96cb57f1368cdf89
702Author: Gaetan Nadon <memsize@videotron.ca>
703Date:   Thu Nov 26 09:19:54 2009 -0500
704
705    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
706    
707    Now that the INSTALL file is generated.
708    Allows running make maintainer-clean.
709
710commit 0fa4fd255c494b8d9551453c07521fc7473fc2b6
711Author: Gaetan Nadon <memsize@videotron.ca>
712Date:   Wed Oct 28 14:09:08 2009 -0400
713
714    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
715    
716    Add missing INSTALL file. Use standard GNU file on building tarball
717    README may have been updated
718    Remove AUTHORS file as it is empty and no content available yet.
719    Remove NEWS file as it is empty and no content available yet.
720
721commit b90564dc7339082f8325d06edb28264f1b6e8bb6
722Author: Gaetan Nadon <memsize@videotron.ca>
723Date:   Mon Oct 26 22:08:39 2009 -0400
724
725    Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
726    
727    ChangeLog filename is known to Automake and requires no further
728    coding in the makefile.
729
730commit aa5fd3d4dded23b6045e93ac220edb13b68a4658
731Author: Gaetan Nadon <memsize@videotron.ca>
732Date:   Thu Oct 22 12:34:16 2009 -0400
733
734    .gitignore: use common defaults with custom section # 24239
735    
736    Using common defaults will reduce errors and maintenance.
737    Only the very small or inexistent custom section need periodic maintenance
738    when the structure of the component changes. Do not edit defaults.
739
740commit cf6bd9d305726420905f2aa7c7471665f5e70f7c
741Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
742Date:   Wed Oct 21 12:47:21 2009 -0700
743
744    This is not a GNU project, so declare it foreign.
745    
746    On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
747    > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
748    > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
749    > > was quite annoying to work around since 'autoreconf -fvi' replaces
750    > > it and git wants to commit it.  Should these files even be in git?
751    > > Can I nuke them for the betterment of humanity and since they get
752    > > created by autoreconf anyways?
753    >
754    > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
755    
756    As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
757    AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
758    of the INSTALL file. It is also part of the 24206 solution.
759    
760    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
761
762commit b3a7a1fb2356d6fba676746f60176f1a69b9a72a
763Author: Alan Coopersmith <alan.coopersmith@sun.com>
764Date:   Mon Oct 12 15:04:50 2009 -0700
765
766    xrdb 1.0.6
767    
768    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
769
770commit eafabf10c3738bba223d7522f8b5804d1d54c6d4
771Author: Alan Coopersmith <alan.coopersmith@sun.com>
772Date:   Mon Oct 12 14:55:22 2009 -0700
773
774    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
775    
776    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
777
778commit d2c5485dcab34074fa9bd62b7a0567364382e07b
779Author: Alan Coopersmith <alan.coopersmith@sun.com>
780Date:   Mon Oct 12 14:37:28 2009 -0700
781
782    Fill in COPYING file with notices from xrdb.c & xrdb.man
783    
784    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
785
786commit b2aebe2b2879c6f6a23d34c7b7b637b8b216e2a3
787Author: Alan Coopersmith <alan.coopersmith@sun.com>
788Date:   Thu Oct 1 14:54:29 2009 -0700
789
790    Add README with pointers to mailing lists, bugzilla, & git
791    
792    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
793
794commit 29f87977d6f503186da4863eea28db2f206bca22
795Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
796Date:   Mon Jan 26 16:45:11 2009 -0200
797
798    Correct make distcheck and sparse warnings.
799
800commit fc0b73673a7b91b386d8a346652f9cc0c4a68d44
801Author: Alan Coopersmith <alan.coopersmith@sun.com>
802Date:   Mon Oct 20 14:33:23 2008 -0700
803
804    Allow specifying multiple paths to --with-cpp and running if none is found
805    
806    Merge of code from the old Solaris xrdb that allows having cpp found at
807    compile time, but not erroring out if it's not found at runtime, and
808    if necessary, checking for it in multiple locations.
809
810commit 0de4f54967a7ab923817712eb96b64ca1ebe84a5
811Author: Stuart Kreitman <Stuart.Kreitman@sun.com>
812Date:   Mon Aug 4 17:12:58 2008 -0700
813
814    Avoid divide by zero crash if DDX mistakenly returns screen size of 0mm.
815
816commit d8b7fa56de252ba78edab5e504a2c7650e9e9123
817Author: Adam Jackson <ajax@redhat.com>
818Date:   Thu Mar 6 17:16:36 2008 -0500
819
820    xrdb 1.0.5
821
822commit 09ef847d16333d6ae04c3f88ff7f535381cb9405
823Author: Luca Capello <luca@pca.it>
824Date:   Mon Jan 7 23:48:12 2008 +0100
825
826    Prevent cpp from prefixing errors with <stdin> when the xrdb input is a file
827    
828    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=458246
829
830commit ab156455b2f759cc4cb0edc3265ccb9bba53f2ed
831Author: James Cloos <cloos@jhcloos.com>
832Date:   Thu Dec 6 15:51:09 2007 -0500
833
834    Add missing PHONY line for automatic ChangeLog generation
835
836commit 13917748af3288ae188cbe9c05742411d53ec34f
837Author: Alan Coopersmith <alan.coopersmith@sun.com>
838Date:   Wed Aug 15 15:35:00 2007 -0700
839
840    Version bump: 1.0.4
841
842commit 6202638b9962dceb4f72357bff76896e23c8fe5e
843Author: Alan Coopersmith <alan.coopersmith@sun.com>
844Date:   Wed Aug 15 15:31:16 2007 -0700
845
846    Change xrdb_CFLAGS to AM_CFLAGS to make automake-1.10 happier
847    
848    Makefile.am:27: compiling `xrdb.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
849
850commit 0b2171f2af1a5790753bb6516ac32411b1b89ef3
851Author: Alan Coopersmith <alan.coopersmith@sun.com>
852Date:   Wed Apr 11 15:33:56 2007 -0700
853
854    Bug #10616: Man page grammar fix: s/This never be/This should never be/
855    
856    X.Org Bugzilla #10616: <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
857    Reported upstream from
858    Debian bug #354923 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=354923>
859
860commit a2b12134c2216dc29581dd849a89e48187ddf66f
861Author: Alan Coopersmith <alan.coopersmith@sun.com>
862Date:   Tue Jan 23 17:47:28 2007 -0800
863
864    Version bump: 1.0.3
865
866commit 0379f5fb2b8c5860d8e2652df51ab5d8363518b2
867Author: Alan Coopersmith <alan.coopersmith@sun.com>
868Date:   Tue Jan 23 17:46:02 2007 -0800
869
870    Replace static ChangeLog with dist-hook to generate from git log
871
872commit 407a5343d87b50f8496afe76bc26396e58b1c543
873Author: Alan Coopersmith <alan.coopersmith@sun.com>
874Date:   Tue Jan 2 18:54:39 2007 -0800
875
876    renamed: .cvsignore -> .gitignore
877
878commit a412444f2b3190cc6513bd0649de68a21089f487
879Author: Eric S. Raymond <esr@thyrsus.com>
880Date:   Tue Jan 2 18:54:13 2007 -0800
881
882    Bug 9521: Markup problem in xrdb.1 man page
883    
884    <https://bugs.freedesktop.org/show_bug.cgi?id=9521>
885
886commit ee16f1a1d55efdc8176e025dd8c3482aabfc6d57
887Author: Adam Jackson <ajax@nwnk.net>
888Date:   Wed Apr 26 23:46:36 2006 +0000
889
890    Bump to 1.0.2
891
892commit df0f7049f9cf1a5aac8964bf87b484afd8a5bd94
893Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
894Date:   Mon Apr 3 20:33:30 2006 +0000
895
896    Copy authors list from comment in xrdb.c
897
898commit b8165e4d7fe46f4355c163cf9a7be0213286f2c9
899Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
900Date:   Mon Apr 3 20:32:20 2006 +0000
901
902    Convert sprintf/strcpy/strcat calls to snprintf to enforce bounds checking.
903
904commit e8420306923dbe7c02b5322f2320dee18cc54f96
905Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
906Date:   Mon Apr 3 18:23:14 2006 +0000
907
908    Plug memory leak of extension names list. (Coverity id #612)
909
910commit 35c00cc86015f0d33a842441aad726dc2fe9a14b
911Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
912Date:   Wed Mar 29 03:27:37 2006 +0000
913
914    Get rid of OS-checking #ifdefs by adding configure checks to find the right
915        header for MAXHOSTNAMELEN (<sys/param.h> for BSD/Linux, <netdb.h> for
916        Solaris) and deleting ancient rename() function for pre-POSIX.1-1990
917        SysV systems.
918
919commit 43d30e640ff32bd2973493877f2a5d49fae24d8f
920Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
921Date:   Wed Mar 29 02:20:46 2006 +0000
922
923    Bug #6386 <https://bugs.freedesktop.org/show_bug.cgi?id=6386> Add appres &
924        listres man pages to SEE ALSO list (Paul Vojta)
925
926commit ab34a4353e479a01a392977496d0276c769489f7
927Author: Kevin E Martin <kem@kem.org>
928Date:   Wed Dec 21 02:29:53 2005 +0000
929
930    Update package version for X11R7 release.
931
932commit 555a9e424b4733f49234209db6ef47375a3bae6c
933Author: Adam Jackson <ajax@nwnk.net>
934Date:   Mon Dec 19 16:22:46 2005 +0000
935
936    Stub COPYING files
937
938commit a43f52abfc732b77524e4dc0feb1cb65e9e403f1
939Author: Kevin E Martin <kem@kem.org>
940Date:   Thu Dec 15 00:24:10 2005 +0000
941
942    Update package version number for final X11R7 release candidate.
943
944commit febf0c20728c501abfe9cc4547661a7af2830bb4
945Author: Kevin E Martin <kem@kem.org>
946Date:   Tue Dec 6 22:48:25 2005 +0000
947
948    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
949
950commit 6e50db381cbeb044adaf574f4250bc7c7ccc6486
951Author: Kevin E Martin <kem@kem.org>
952Date:   Sat Dec 3 05:49:27 2005 +0000
953
954    Update package version number for X11R7 RC3 release.
955
956commit 63d47d741672fbeca11c61789ef3d02058cf6033
957Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
958Date:   Mon Nov 28 22:01:46 2005 +0000
959
960    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
961        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
962
963commit b8e846b97d7cdc30575dbad201c12c3d0f1f6076
964Author: Eric Anholt <anholt@freebsd.org>
965Date:   Mon Nov 21 10:35:07 2005 +0000
966
967    Another pass at .cvsignores for apps.
968
969commit 483dc299435cbb4241c07bb96acdfc8de04d4ff3
970Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
971Date:   Mon Nov 21 03:14:16 2005 +0000
972
973    Change dependency from xmu to xmuu since the full xmu (with all its baggage
974        like Xt) is not needed here.
975
976commit 9ad35e4bc352abc6af67f5849fa99a7f6da7a6c3
977Author: Eric Anholt <anholt@freebsd.org>
978Date:   Sun Nov 20 22:08:55 2005 +0000
979
980    Add/improve .cvsignore files for apps.
981
982commit 175abf8b20f0bef44e5d01fd9369cf31fc77937b
983Author: Kevin E Martin <kem@kem.org>
984Date:   Wed Oct 19 02:47:57 2005 +0000
985
986    Update package version number for RC1 release.
987
988commit 349c2175e29e65cd7c9a4e42d4977ae2384deab3
989Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
990Date:   Mon Oct 17 23:56:24 2005 +0000
991
992    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
993        work better with BSD make
994
995commit 8681e4c6a00ec7970976b5b657d045c16970fd7d
996Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
997Date:   Fri Oct 14 00:25:47 2005 +0000
998
999    Use sed to fill in variables in man page
1000
1001commit acccbb73de4d648c240d75d653c23012aa313b65
1002Author: Kevin E Martin <kem@kem.org>
1003Date:   Fri Jul 29 21:22:37 2005 +0000
1004
1005    Various changes preparing packages for RC0:
1006    - Verify and update package version numbers as needed
1007    - Implement versioning scheme
1008    - Change bug address to point to bugzilla bug entry form
1009    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
1010        reenable it)
1011    - Fix makedepend to use pkgconfig and pass distcheck
1012    - Update build script to build macros first
1013    - Update modular Xorg version
1014
1015commit f94df9ba9cb0bbe2c6e107d9b896237f6d4f0af2
1016Author: Daniel Stone <daniel@fooishbar.org>
1017Date:   Wed Jul 27 01:54:18 2005 +0000
1018
1019    Move manpages to section 1 instead of section m.
1020
1021commit 49dddff2596554fd155ee0f3d2b92b0e20957dec
1022Author: Adam Jackson <ajax@nwnk.net>
1023Date:   Wed Jul 20 19:32:03 2005 +0000
1024
1025    Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
1026        configure cache, you cache it, and the cached value is probably wrong.
1027
1028commit fa06b8ced994114f0f7bddc1264b9ada3d9120d9
1029Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
1030Date:   Sat Jul 16 21:59:14 2005 +0000
1031
1032    Define HAS_MKSTEMP if mkstemp() is present (needed for improved protection
1033        against tempfile race conditions in many places)
1034
1035commit 7c5d8ed741ad0cbb51b14f35d06b2db6c750ea68
1036Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
1037Date:   Mon Jul 4 00:22:01 2005 +0000
1038
1039    Add #ifdef HAVE_CONFIG_H/#include <config.h> for modularization.
1040
1041commit 2c9da0dc941fc36742bc6fe17e9f2558147da31d
1042Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
1043Date:   Sat Jul 2 01:18:58 2005 +0000
1044
1045    Fix typo in list of paths to search for cpp
1046
1047commit 9acc19a756d8da3927e82e8e5052b13af117d868
1048Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
1049Date:   Sat Jul 2 01:17:35 2005 +0000
1050
1051    Use --with-cpp or search in $PATH and well known locations to set CPP
1052        (replaces per-OS hardcoding of CppCmd in Imake config files)
1053
1054commit 14ca3186594492b2733b9cc7e071ecfc039fb428
1055Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
1056Date:   Fri Jul 1 20:27:45 2005 +0000
1057
1058    Build systems for xrdb, xrandr, xrefresh
1059
1060commit 2f4ad176ce472ee7db9847670d3580f2c65b3e80
1061Author: Egbert Eich <eich@suse.de>
1062Date:   Fri Apr 23 19:55:03 2004 +0000
1063
1064    Merging XORG-CURRENT into trunk
1065
1066commit ebda21a02e67f2d27da10bd5bfd4c5ddbf69df31
1067Author: Egbert Eich <eich@suse.de>
1068Date:   Sun Mar 14 08:35:42 2004 +0000
1069
1070    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
1071
1072commit eac2dfd5e56d82e1ce65918b4a6c5af59b8109d6
1073Author: Egbert Eich <eich@suse.de>
1074Date:   Wed Mar 3 12:13:15 2004 +0000
1075
1076    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
1077
1078commit 701705286ce179e195a3bece80868b7597888e59
1079Author: Egbert Eich <eich@suse.de>
1080Date:   Thu Feb 26 13:36:26 2004 +0000
1081
1082    readding XFree86's cvs IDs
1083
1084commit cde9ecbbd5b78c846dbba35a1c79969cfcbda11a
1085Author: Egbert Eich <eich@suse.de>
1086Date:   Thu Feb 26 09:24:14 2004 +0000
1087
1088    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
1089
1090commit 8045f8dba3be858c476d3e49a4532213ec374191
1091Author: Kaleb Keithley <kaleb@freedesktop.org>
1092Date:   Tue Nov 25 19:29:15 2003 +0000
1093
1094    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
1095
1096commit 3c97a34f31d0d3353e31bd413d40959051584e9b
1097Author: Kaleb Keithley <kaleb@freedesktop.org>
1098Date:   Fri Nov 14 16:49:23 2003 +0000
1099
1100    XFree86 4.3.0.1
1101
1102commit 5d0007c9b0fe41464e713f961b3510117971d8fe
1103Author: Kaleb Keithley <kaleb@freedesktop.org>
1104Date:   Fri Nov 14 15:54:54 2003 +0000
1105
1106    R6.6 is the Xorg base-line
1107