Home | History | Annotate | Line # | Download | only in dist
ChangeLog revision 1.1.1.3
      1  1.1.1.3  mrg commit 0c55a8f8edabef5ccd9930048df7d3aecd551d54
      2  1.1.1.3  mrg Author: Alan Coopersmith <alan.coopersmith (a] oracle.com>
      3  1.1.1.3  mrg Date:   Sat Oct 30 11:47:05 2010 -0700
      4  1.1.1.3  mrg 
      5  1.1.1.3  mrg     xsetroot 1.1.0
      6  1.1.1.3  mrg     
      7  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
      8  1.1.1.3  mrg 
      9  1.1.1.3  mrg commit a2a23d1ca4ae7940465d525f2219cb97e1f5efe7
     10  1.1.1.3  mrg Author: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     11  1.1.1.3  mrg Date:   Sat Oct 30 11:46:31 2010 -0700
     12  1.1.1.3  mrg 
     13  1.1.1.3  mrg     config: Remove unnecessary calls from configure.ac
     14  1.1.1.3  mrg     
     15  1.1.1.3  mrg     AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
     16  1.1.1.3  mrg     PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
     17  1.1.1.3  mrg     
     18  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     19  1.1.1.3  mrg 
     20  1.1.1.3  mrg commit 047e49cad119109378c97436f2fe77b93e747376
     21  1.1.1.3  mrg Author: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     22  1.1.1.3  mrg Date:   Sat Oct 30 11:45:03 2010 -0700
     23  1.1.1.3  mrg 
     24  1.1.1.3  mrg     Add -xcf option to man page
     25  1.1.1.3  mrg     
     26  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     27  1.1.1.3  mrg 
     28  1.1.1.3  mrg commit 0be4a12c29687e26a5fd77a6f8df2d6eca5fea20
     29  1.1.1.3  mrg Author: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     30  1.1.1.3  mrg Date:   Sat Oct 30 11:37:00 2010 -0700
     31  1.1.1.3  mrg 
     32  1.1.1.3  mrg     config: upgrade to util-macros 1.8 for additional man page support
     33  1.1.1.3  mrg     
     34  1.1.1.3  mrg     Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
     35  1.1.1.3  mrg     The value of MAN_SUBST is the same for all X.Org packages.
     36  1.1.1.3  mrg     
     37  1.1.1.3  mrg     Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
     38  1.1.1.3  mrg     Enables use of platform appropriate version of sed.
     39  1.1.1.3  mrg     
     40  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     41  1.1.1.3  mrg 
     42  1.1.1.3  mrg commit b86dc97d437b16a9384c2c2b9799918c9f7d1e6a
     43  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     44  1.1.1.3  mrg Date:   Sat Oct 30 11:35:16 2010 -0700
     45  1.1.1.3  mrg 
     46  1.1.1.3  mrg     config: update AC_PREREQ statement to 2.60
     47  1.1.1.3  mrg     
     48  1.1.1.3  mrg     Unrelated to the previous patches, the new value simply reflects
     49  1.1.1.3  mrg     the reality that the minimum level for autoconf to configure
     50  1.1.1.3  mrg     all x.org modules is 2.60 dated June 2006.
     51  1.1.1.3  mrg     
     52  1.1.1.3  mrg     ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
     53  1.1.1.3  mrg     
     54  1.1.1.3  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
     55  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     56  1.1.1.3  mrg 
     57  1.1.1.3  mrg commit 8cf3ceab5cf2f2a583bdbe13a2f23061c6458546
     58  1.1.1.3  mrg Author: Keith Packard <keithp (a] keithp.com>
     59  1.1.1.3  mrg Date:   Thu Oct 21 17:51:35 2010 -0700
     60  1.1.1.3  mrg 
     61  1.1.1.3  mrg     Add -xcf flag to load arbitrary ARGB cursor file
     62  1.1.1.3  mrg     
     63  1.1.1.3  mrg     Instead of having to construct a whole cursor theme and play with the
     64  1.1.1.3  mrg     environment variables in Xlib to set a random ARGB cursor, this lets
     65  1.1.1.3  mrg     the user set whatever they like directly from a file.
     66  1.1.1.3  mrg     
     67  1.1.1.3  mrg     Signed-off-by: Keith Packard <keithp (a] keithp.com>
     68  1.1.1.3  mrg 
     69  1.1.1.3  mrg commit e5430a15a0eed9c209f0df1b19ac79eca195088e
     70  1.1.1.3  mrg Author: Jesse Adkins <jesserayadkins (a] gmail.com>
     71  1.1.1.3  mrg Date:   Tue Sep 28 13:29:50 2010 -0700
     72  1.1.1.3  mrg 
     73  1.1.1.3  mrg     Purge cvs tags.
     74  1.1.1.3  mrg     
     75  1.1.1.3  mrg     Signed-off-by: Jesse Adkins <jesserayadkins (a] gmail.com>
     76  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     77  1.1.1.3  mrg 
     78  1.1.1.3  mrg commit 978cc1aa7944debb4a8eb8c928825eb28041d51a
     79  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     80  1.1.1.3  mrg Date:   Thu Nov 26 09:19:55 2009 -0500
     81  1.1.1.3  mrg 
     82  1.1.1.3  mrg     Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
     83  1.1.1.3  mrg     
     84  1.1.1.3  mrg     Now that the INSTALL file is generated.
     85  1.1.1.3  mrg     Allows running make maintainer-clean.
     86  1.1.1.3  mrg 
     87  1.1.1.3  mrg commit cebcf0ab7f59e3e261d410b85f3433974de3cbf8
     88  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     89  1.1.1.3  mrg Date:   Wed Oct 28 14:09:09 2009 -0400
     90  1.1.1.3  mrg 
     91  1.1.1.3  mrg     INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
     92  1.1.1.3  mrg     
     93  1.1.1.3  mrg     Add missing INSTALL file. Use standard GNU file on building tarball
     94  1.1.1.3  mrg     README may have been updated
     95  1.1.1.3  mrg     Remove AUTHORS file as it is empty and no content available yet.
     96  1.1.1.3  mrg     Remove NEWS file as it is empty and no content available yet.
     97  1.1.1.3  mrg 
     98  1.1.1.3  mrg commit dcff32ec5fb57783a1bb315de14b9548b4806682
     99  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    100  1.1.1.3  mrg Date:   Mon Oct 26 22:08:39 2009 -0400
    101  1.1.1.3  mrg 
    102  1.1.1.3  mrg     Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
    103  1.1.1.3  mrg     
    104  1.1.1.3  mrg     ChangeLog filename is known to Automake and requires no further
    105  1.1.1.3  mrg     coding in the makefile.
    106  1.1.1.3  mrg 
    107  1.1.1.3  mrg commit f9ec4ed5b9422cd59d51b608466fbc7834041a64
    108  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    109  1.1.1.3  mrg Date:   Thu Oct 22 12:34:16 2009 -0400
    110  1.1.1.3  mrg 
    111  1.1.1.3  mrg     .gitignore: use common defaults with custom section # 24239
    112  1.1.1.3  mrg     
    113  1.1.1.3  mrg     Using common defaults will reduce errors and maintenance.
    114  1.1.1.3  mrg     Only the very small or inexistent custom section need periodic maintenance
    115  1.1.1.3  mrg     when the structure of the component changes. Do not edit defaults.
    116  1.1.1.3  mrg 
    117  1.1.1.3  mrg commit fc3c90aa5b77645198450c32b4e1f054674dd547
    118  1.1.1.3  mrg Author: Jeremy Huddleston <jeremyhu (a] freedesktop.org>
    119  1.1.1.3  mrg Date:   Wed Oct 21 12:47:22 2009 -0700
    120  1.1.1.3  mrg 
    121  1.1.1.3  mrg     This is not a GNU project, so declare it foreign.
    122  1.1.1.3  mrg     
    123  1.1.1.3  mrg     On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
    124  1.1.1.3  mrg     > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
    125  1.1.1.3  mrg     > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
    126  1.1.1.3  mrg     > > was quite annoying to work around since 'autoreconf -fvi' replaces
    127  1.1.1.3  mrg     > > it and git wants to commit it.  Should these files even be in git?
    128  1.1.1.3  mrg     > > Can I nuke them for the betterment of humanity and since they get
    129  1.1.1.3  mrg     > > created by autoreconf anyways?
    130  1.1.1.3  mrg     >
    131  1.1.1.3  mrg     > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
    132  1.1.1.3  mrg     
    133  1.1.1.3  mrg     As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
    134  1.1.1.3  mrg     AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
    135  1.1.1.3  mrg     of the INSTALL file. It is also part of the 24206 solution.
    136  1.1.1.3  mrg     
    137  1.1.1.3  mrg     Signed-off-by: Jeremy Huddleston <jeremyhu (a] freedesktop.org>
    138  1.1.1.3  mrg 
    139  1.1.1.2  mrg commit 1a978aec136389c13fcdda31b34cb58d4dd3bf25
    140  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    141  1.1.1.2  mrg Date:   Fri Oct 16 19:32:50 2009 -0700
    142  1.1.1.2  mrg 
    143  1.1.1.2  mrg     xsetroot 1.0.3
    144  1.1.1.2  mrg     
    145  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    146  1.1.1.2  mrg 
    147  1.1.1.2  mrg commit d8ec58af0f62076805bd6b691e284bcd2176724b
    148  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    149  1.1.1.2  mrg Date:   Fri Oct 16 19:32:06 2009 -0700
    150  1.1.1.2  mrg 
    151  1.1.1.2  mrg     Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
    152  1.1.1.2  mrg     
    153  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    154  1.1.1.2  mrg 
    155  1.1.1.2  mrg commit cc4216ff1f17c97fb5aa1a9a5f58e2574ca8af0b
    156  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    157  1.1.1.2  mrg Date:   Fri Oct 16 19:29:11 2009 -0700
    158  1.1.1.2  mrg 
    159  1.1.1.2  mrg     Fill in COPYING file with copyright/license notice from code & docs
    160  1.1.1.2  mrg     
    161  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    162  1.1.1.2  mrg 
    163  1.1.1.2  mrg commit 90bbea206988567520f7cb2b7f6e95ef704c172d
    164  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    165  1.1.1.2  mrg Date:   Thu Oct 1 14:54:30 2009 -0700
    166  1.1.1.2  mrg 
    167  1.1.1.2  mrg     Add README with pointers to mailing lists, bugzilla, & git
    168  1.1.1.2  mrg     
    169  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    170  1.1.1.2  mrg 
    171  1.1.1.2  mrg commit 67c87156d9bf8c7f520106c9e2fa786f3d21eaa2
    172  1.1.1.2  mrg Author: Paulo Cesar Pereira de Andrade <pcpa (a] mandriva.com.br>
    173  1.1.1.2  mrg Date:   Mon Jan 26 18:12:56 2009 -0200
    174  1.1.1.2  mrg 
    175  1.1.1.2  mrg     Correct make distcheck and sparse warnings.
    176  1.1.1.2  mrg 
    177      1.1  mrg commit ba9fbd14258ab44c794bb1a6dd9af51c5f4c01ff
    178      1.1  mrg Author: Matthieu Herrb <matthieu (a] bluenote.herrb.com>
    179      1.1  mrg Date:   Fri Aug 10 10:45:46 2007 +0200
    180      1.1  mrg 
    181      1.1  mrg     Bump version for release
    182      1.1  mrg 
    183      1.1  mrg commit d1658d389d7fbad0c2ec2ea5e8563c3d06ed2a47
    184      1.1  mrg Author: Matthieu Herrb <matthieu.herrb (a] laas.fr>
    185      1.1  mrg Date:   Mon Jul 30 21:17:42 2007 +0200
    186      1.1  mrg 
    187      1.1  mrg     Add option to check code with lint/sparse/etc.
    188      1.1  mrg 
    189      1.1  mrg commit 9282a4aa79b3cb4ae091a594de61dfc2ecfd9ea3
    190      1.1  mrg Author: Matthieu Herrb <matthieu (a] bluenote.herrb.com>
    191      1.1  mrg Date:   Mon Jul 30 21:11:20 2007 +0200
    192      1.1  mrg 
    193      1.1  mrg     Change xsetroot_CFLAGS to AM_CFLAGS to avoid automake-1.10 warning
    194      1.1  mrg 
    195      1.1  mrg commit fe4a33713aca2ce32053f2c8356423efd1f534e1
    196      1.1  mrg Author: Matthieu Herrb <matthieu.herrb (a] laas.fr>
    197      1.1  mrg Date:   Mon Jul 30 21:08:00 2007 +0200
    198      1.1  mrg 
    199      1.1  mrg     - Replace static ChangeLog with disthook to generate from git log
    200      1.1  mrg     - generate INSTALL
    201      1.1  mrg 
    202      1.1  mrg commit f479fd29a876d445291d7e55de9e9a22bac419b6
    203      1.1  mrg Author: Matthieu Herrb <matthieu.herrb (a] laas.fr>
    204      1.1  mrg Date:   Mon Jul 30 21:07:05 2007 +0200
    205      1.1  mrg 
    206      1.1  mrg     - renamed .cvsignore -> .gitignore
    207      1.1  mrg     - Replace static ChangeLog with disthook to generate from git log
    208      1.1  mrg 
    209      1.1  mrg commit 382e52e07a110628efa0784b64088f6f64ae3112
    210      1.1  mrg Author: Marc Balmer <mbalmer (a] openbsd.org>
    211      1.1  mrg Date:   Mon Jul 30 20:47:53 2007 +0200
    212      1.1  mrg 
    213      1.1  mrg     Typo, it's xsetroot, not setroot.
    214      1.1  mrg 
    215      1.1  mrg commit e43e2cc868cff003d3e69c17a69bb7440393c359
    216      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    217      1.1  mrg Date:   Wed Dec 21 02:29:54 2005 +0000
    218      1.1  mrg 
    219      1.1  mrg     Update package version for X11R7 release.
    220      1.1  mrg 
    221      1.1  mrg commit 3c3dc25e901fe4a93d308a4456d00783d6fff252
    222      1.1  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    223      1.1  mrg Date:   Mon Dec 19 16:22:47 2005 +0000
    224      1.1  mrg 
    225      1.1  mrg     Stub COPYING files
    226      1.1  mrg 
    227      1.1  mrg commit 4e633038f484b9955fe6aa80fdbbcc4d827fa4f3
    228      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    229      1.1  mrg Date:   Thu Dec 15 00:24:11 2005 +0000
    230      1.1  mrg 
    231      1.1  mrg     Update package version number for final X11R7 release candidate.
    232      1.1  mrg 
    233      1.1  mrg commit aa60171a0cf04a787a29e1af3551976652d8ce84
    234      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    235      1.1  mrg Date:   Tue Dec 6 22:48:26 2005 +0000
    236      1.1  mrg 
    237      1.1  mrg     Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
    238      1.1  mrg 
    239      1.1  mrg commit a3844b7b2f68e295f69e9a8dbf45f311b717362b
    240      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    241      1.1  mrg Date:   Sat Dec 3 05:49:28 2005 +0000
    242      1.1  mrg 
    243      1.1  mrg     Update package version number for X11R7 RC3 release.
    244      1.1  mrg 
    245      1.1  mrg commit a5056d61df9bc78b10ad200a7fc250842f034204
    246      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    247      1.1  mrg Date:   Mon Nov 28 22:01:47 2005 +0000
    248      1.1  mrg 
    249      1.1  mrg     Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
    250      1.1  mrg         update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
    251      1.1  mrg 
    252      1.1  mrg commit bfc05c358c4c8698292e40729ede000939cfe4a8
    253      1.1  mrg Author: Eric Anholt <anholt (a] freebsd.org>
    254      1.1  mrg Date:   Mon Nov 21 10:35:08 2005 +0000
    255      1.1  mrg 
    256      1.1  mrg     Another pass at .cvsignores for apps.
    257      1.1  mrg 
    258      1.1  mrg commit 9826f19633f549f2282702f19e33f7e51c4c5e9e
    259      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    260      1.1  mrg Date:   Mon Nov 21 03:14:16 2005 +0000
    261      1.1  mrg 
    262      1.1  mrg     Change dependency from xmu to xmuu since the full xmu (with all its baggage
    263      1.1  mrg         like Xt) is not needed here.
    264      1.1  mrg 
    265      1.1  mrg commit d6817bf87bfcd2be3215ea9e28e6d13b1d438657
    266      1.1  mrg Author: Eric Anholt <anholt (a] freebsd.org>
    267      1.1  mrg Date:   Sun Nov 20 22:08:55 2005 +0000
    268      1.1  mrg 
    269      1.1  mrg     Add/improve .cvsignore files for apps.
    270      1.1  mrg 
    271      1.1  mrg commit 86145da43db031adc122f8bf9baacd45be5e7d84
    272      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    273      1.1  mrg Date:   Wed Oct 19 02:47:57 2005 +0000
    274      1.1  mrg 
    275      1.1  mrg     Update package version number for RC1 release.
    276      1.1  mrg 
    277      1.1  mrg commit cb52055c08c845309c126a2763bacaba5798ed65
    278      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    279      1.1  mrg Date:   Mon Oct 17 23:56:25 2005 +0000
    280      1.1  mrg 
    281      1.1  mrg     Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
    282      1.1  mrg         work better with BSD make
    283      1.1  mrg 
    284      1.1  mrg commit a10e876217a9354dd26935fd013cae57882369fa
    285      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    286      1.1  mrg Date:   Fri Oct 14 00:25:48 2005 +0000
    287      1.1  mrg 
    288      1.1  mrg     Use sed to fill in variables in man page
    289      1.1  mrg 
    290      1.1  mrg commit 7b3f04619ecaec58e16a68037c435363ab27f447
    291      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    292      1.1  mrg Date:   Mon Aug 1 20:25:32 2005 +0000
    293      1.1  mrg 
    294      1.1  mrg     Install man pages to section 1 instead of section m (Patch from Donnie
    295      1.1  mrg         Berkholz)
    296      1.1  mrg 
    297      1.1  mrg commit 63dc3c29b9f7af53efe466a7ed1476b4f4f17228
    298      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    299      1.1  mrg Date:   Fri Jul 29 21:22:38 2005 +0000
    300      1.1  mrg 
    301      1.1  mrg     Various changes preparing packages for RC0:
    302      1.1  mrg     - Verify and update package version numbers as needed
    303      1.1  mrg     - Implement versioning scheme
    304      1.1  mrg     - Change bug address to point to bugzilla bug entry form
    305      1.1  mrg     - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
    306      1.1  mrg         reenable it)
    307      1.1  mrg     - Fix makedepend to use pkgconfig and pass distcheck
    308      1.1  mrg     - Update build script to build macros first
    309      1.1  mrg     - Update modular Xorg version
    310      1.1  mrg 
    311      1.1  mrg commit d5e74073175fbfb70a6f859d565262af09938642
    312      1.1  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    313      1.1  mrg Date:   Wed Jul 20 19:32:04 2005 +0000
    314      1.1  mrg 
    315      1.1  mrg     Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
    316      1.1  mrg         configure cache, you cache it, and the cached value is probably wrong.
    317      1.1  mrg 
    318      1.1  mrg commit 0cc65bf4e9e0522422a9bd5824dc21dd05bf0368
    319      1.1  mrg Author: Sren Sandmann Pedersen <sandmann (a] daimi.au.dk>
    320      1.1  mrg Date:   Fri Jul 15 16:49:26 2005 +0000
    321      1.1  mrg 
    322      1.1  mrg     Add dependency on xbitmaps
    323      1.1  mrg 
    324      1.1  mrg commit 2f3ed0d66595b15a2893098d0c0b05a568fb01e7
    325      1.1  mrg Author: Sren Sandmann Pedersen <sandmann (a] daimi.au.dk>
    326      1.1  mrg Date:   Fri Jul 1 20:09:06 2005 +0000
    327      1.1  mrg 
    328      1.1  mrg     xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove
    329      1.1  mrg         whitespace after backslash modularizeapp.sh: s/destkop/desktop/
    330      1.1  mrg         modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and
    331      1.1  mrg         Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h
    332      1.1  mrg     Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo
    333      1.1  mrg 
    334      1.1  mrg commit da9e01ac6c7199ea2d7cac40af7587192c23aff2
    335      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    336      1.1  mrg Date:   Fri Apr 23 19:55:06 2004 +0000
    337      1.1  mrg 
    338      1.1  mrg     Merging XORG-CURRENT into trunk
    339      1.1  mrg 
    340      1.1  mrg commit 7cc5582a833e643be56bc5154e86eea988d537a9
    341      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    342      1.1  mrg Date:   Sun Mar 14 08:35:45 2004 +0000
    343      1.1  mrg 
    344      1.1  mrg     Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
    345      1.1  mrg 
    346      1.1  mrg commit cb915ca7ff57ceabc129556e9771c2fd2c401a76
    347      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    348      1.1  mrg Date:   Wed Mar 3 12:13:18 2004 +0000
    349      1.1  mrg 
    350      1.1  mrg     Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
    351      1.1  mrg 
    352      1.1  mrg commit 10edd9087ebd46ca19500b987054d11f1c8e53fe
    353      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    354      1.1  mrg Date:   Thu Feb 26 13:36:26 2004 +0000
    355      1.1  mrg 
    356      1.1  mrg     readding XFree86's cvs IDs
    357      1.1  mrg 
    358      1.1  mrg commit 0976043e2f31f6bad969c3f996961c59fc953d84
    359      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    360      1.1  mrg Date:   Thu Feb 26 09:24:17 2004 +0000
    361      1.1  mrg 
    362      1.1  mrg     Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
    363      1.1  mrg 
    364      1.1  mrg commit 133f2a1c164a945366816cb4a71419ebe5c575ea
    365      1.1  mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
    366      1.1  mrg Date:   Fri Nov 14 16:49:23 2003 +0000
    367      1.1  mrg 
    368      1.1  mrg     XFree86 4.3.0.1
    369      1.1  mrg 
    370      1.1  mrg commit 500a078602d5db1e420a07c81dada5a676e0cc90
    371      1.1  mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
    372      1.1  mrg Date:   Fri Nov 14 15:54:55 2003 +0000
    373      1.1  mrg 
    374      1.1  mrg     R6.6 is the Xorg base-line
    375