Home | History | Annotate | Line # | Download | only in dist
ChangeLog revision 1.1.1.2
      1  1.1.1.2       mrg commit 46e71051e0eb879a3d08ceb5675afbfdbff1f57b
      2  1.1.1.2       mrg Author: Matt Turner <mattst88 (a] gmail.com>
      3  1.1.1.2       mrg Date:   Mon Jan 21 22:47:57 2013 -0800
      4      1.1  macallan 
      5  1.1.1.2       mrg     xf86-video-sunffb 1.2.2
      6      1.1  macallan 
      7  1.1.1.2       mrg commit 17f43d1d727081f022872a6df88ceebc5a4c3628
      8  1.1.1.2       mrg Author: Adam Jackson <ajax (a] redhat.com>
      9  1.1.1.2       mrg Date:   Tue Sep 25 08:54:56 2012 -0400
     10      1.1  macallan 
     11  1.1.1.2       mrg     Remove mibstore.h
     12  1.1.1.2       mrg     
     13  1.1.1.2       mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
     14      1.1  macallan 
     15  1.1.1.2       mrg commit 079960018061e5ae261ee7f627c6afb859177ef4
     16  1.1.1.2       mrg Author: Dave Airlie <airlied (a] gmail.com>
     17  1.1.1.2       mrg Date:   Mon Jul 16 19:12:32 2012 +1000
     18  1.1.1.2       mrg 
     19  1.1.1.2       mrg     sunffb: fix XAA-less build.
     20  1.1.1.2       mrg     
     21  1.1.1.2       mrg     Signed-off-by: Dave Airlie <airlied (a] redhat.com>
     22  1.1.1.2       mrg 
     23  1.1.1.2       mrg commit 5954960d4bbaee9ee4d2d3a4d1ca9a93d02f6697
     24  1.1.1.2       mrg Author: Dave Airlie <airlied (a] redhat.com>
     25  1.1.1.2       mrg Date:   Thu Jun 7 18:41:23 2012 +0100
     26  1.1.1.2       mrg 
     27  1.1.1.2       mrg     sunffb: port to new compat API.
     28  1.1.1.2       mrg     
     29  1.1.1.2       mrg     Signed-off-by: Dave Airlie <airlied (a] redhat.com>
     30  1.1.1.2       mrg 
     31  1.1.1.2       mrg commit 20e5b57ca3186dd58f88bc663e410aeea638100f
     32  1.1.1.2       mrg Author: Jeremy Huddleston <jeremyhu (a] apple.com>
     33  1.1.1.2       mrg Date:   Sat Oct 29 19:56:26 2011 -0700
     34  1.1.1.2       mrg 
     35  1.1.1.2       mrg     Add missing prototypes to silence warnings
     36  1.1.1.2       mrg     
     37  1.1.1.2       mrg     Signed-off-by: Jeremy Huddleston <jeremyhu (a] apple.com>
     38  1.1.1.2       mrg 
     39  1.1.1.2       mrg commit d76eda9d1c6456ece6b5e2a6b8a772293e10beb6
     40  1.1.1.2       mrg Author: Jeremy Huddleston <jeremyhu (a] apple.com>
     41  1.1.1.2       mrg Date:   Sat Oct 29 19:52:52 2011 -0700
     42  1.1.1.2       mrg 
     43  1.1.1.2       mrg     Use malloc/calloc/realloc/free directly
     44  1.1.1.2       mrg     
     45  1.1.1.2       mrg     Signed-off-by: Jeremy Huddleston <jeremyhu (a] apple.com>
     46  1.1.1.2       mrg 
     47  1.1.1.2       mrg commit 205ed4acdfc9e73821b83244cb27f808bbab9933
     48  1.1.1.2       mrg Author: Jesse Adkins <jesserayadkins (a] gmail.com>
     49  1.1.1.2       mrg Date:   Tue Sep 28 13:29:51 2010 -0700
     50  1.1.1.2       mrg 
     51  1.1.1.2       mrg     Purge cvs tags.
     52  1.1.1.2       mrg     
     53  1.1.1.2       mrg     Signed-off-by: Jesse Adkins <jesserayadkins (a] gmail.com>
     54  1.1.1.2       mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     55  1.1.1.2       mrg 
     56  1.1.1.2       mrg commit 0fceb69e06e143e6a0c4ced64c1237ec420c85b8
     57  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     58  1.1.1.2       mrg Date:   Wed Jul 21 16:49:04 2010 -0400
     59  1.1.1.2       mrg 
     60  1.1.1.2       mrg     config: add comments for main statements
     61  1.1.1.2       mrg 
     62  1.1.1.2       mrg commit fcc30b64c0d5512ab8acd4248da5aaaa12e10b80
     63  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     64  1.1.1.2       mrg Date:   Wed Jul 21 16:07:00 2010 -0400
     65  1.1.1.2       mrg 
     66  1.1.1.2       mrg     config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
     67  1.1.1.2       mrg     
     68  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
     69  1.1.1.2       mrg 
     70  1.1.1.2       mrg commit 3c193eae6b172540eb1127f3f78619e562b8f18d
     71  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     72  1.1.1.2       mrg Date:   Wed Jul 21 14:37:41 2010 -0400
     73  1.1.1.2       mrg 
     74  1.1.1.2       mrg     config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
     75  1.1.1.2       mrg     
     76  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
     77  1.1.1.2       mrg 
     78  1.1.1.2       mrg commit 482076d49e7e6077c8d8bf68bbf7814b79b4b5ff
     79  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     80  1.1.1.2       mrg Date:   Wed Jul 21 14:05:23 2010 -0400
     81  1.1.1.2       mrg 
     82  1.1.1.2       mrg     config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
     83  1.1.1.2       mrg     
     84  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
     85  1.1.1.2       mrg 
     86  1.1.1.2       mrg commit 46c139525092a5d0565a8d0efd53605c216f1f93
     87  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     88  1.1.1.2       mrg Date:   Wed Jul 21 09:27:42 2010 -0400
     89  1.1.1.2       mrg 
     90  1.1.1.2       mrg     config: complete AC_INIT m4 quoting
     91  1.1.1.2       mrg     
     92  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
     93  1.1.1.2       mrg 
     94  1.1.1.2       mrg commit e4720abcbd0965eeb58bdd1eee66506c8b46110a
     95  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     96  1.1.1.2       mrg Date:   Tue Jul 20 21:44:58 2010 -0400
     97  1.1.1.2       mrg 
     98  1.1.1.2       mrg     config: remove unrequired AC_SUBST([XORG_CFLAGS])
     99  1.1.1.2       mrg     
    100  1.1.1.2       mrg     This macro is called by PKG_CHECK_MODULES
    101  1.1.1.2       mrg     
    102  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    103  1.1.1.2       mrg 
    104  1.1.1.2       mrg commit ad2fcf65a4b26d4313ad3ff164f8a6f103bf2fe2
    105  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    106  1.1.1.2       mrg Date:   Tue Jul 20 20:24:42 2010 -0400
    107  1.1.1.2       mrg 
    108  1.1.1.2       mrg     config: remove unrequired AC_HEADER_STDC
    109  1.1.1.2       mrg     
    110  1.1.1.2       mrg     Autoconf says:
    111  1.1.1.2       mrg     "This macro is obsolescent, as current systems have conforming
    112  1.1.1.2       mrg     header files. New programs need not use this macro".
    113  1.1.1.2       mrg     
    114  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    115  1.1.1.2       mrg 
    116  1.1.1.2       mrg commit 6b4530c9a82f2a499e961d3eaa370b6b918ae2d4
    117  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    118  1.1.1.2       mrg Date:   Tue Jul 20 19:41:31 2010 -0400
    119  1.1.1.2       mrg 
    120  1.1.1.2       mrg     config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
    121  1.1.1.2       mrg     
    122  1.1.1.2       mrg     XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
    123  1.1.1.2       mrg     AC_PROG_C_C99. This sets gcc with -std=gnu99.
    124  1.1.1.2       mrg     If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
    125  1.1.1.2       mrg     
    126  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    127  1.1.1.2       mrg 
    128  1.1.1.2       mrg commit cec4e973f7b494f246aaae6f6680710efcec414d
    129  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    130  1.1.1.2       mrg Date:   Tue Jul 20 18:45:19 2010 -0400
    131  1.1.1.2       mrg 
    132  1.1.1.2       mrg     config: update AC_PREREQ statement to 2.60
    133  1.1.1.2       mrg     
    134  1.1.1.2       mrg     Unrelated to the previous patches, the new value simply reflects
    135  1.1.1.2       mrg     the reality that the minimum level for autoconf to configure
    136  1.1.1.2       mrg     all x.org modules is 2.60 dated June 2006.
    137  1.1.1.2       mrg     
    138  1.1.1.2       mrg     ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
    139  1.1.1.2       mrg     
    140  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    141  1.1.1.2       mrg 
    142  1.1.1.2       mrg commit a7761b1173073145f76eb5b8beb7ebf22affe4cc
    143  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    144  1.1.1.2       mrg Date:   Tue Jul 20 16:15:30 2010 -0400
    145  1.1.1.2       mrg 
    146  1.1.1.2       mrg     config: upgrade to util-macros 1.8 for additional man page support
    147  1.1.1.2       mrg     
    148  1.1.1.2       mrg     Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
    149  1.1.1.2       mrg     The value of MAN_SUBST is the same for all X.Org packages.
    150  1.1.1.2       mrg 
    151  1.1.1.2       mrg commit b66ebd55e7464563a6ff41c847cf8d339c9c90c5
    152  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    153  1.1.1.2       mrg Date:   Sun Jun 13 11:17:54 2010 -0400
    154  1.1.1.2       mrg 
    155  1.1.1.2       mrg     COPYING: replace stub file with actual Copyright notices.
    156  1.1.1.2       mrg     
    157  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    158  1.1.1.2       mrg 
    159  1.1.1.2       mrg commit de8b9a67020f0e12b55a7de017398d050600ca41
    160  1.1.1.2       mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    161  1.1.1.2       mrg Date:   Fri Jan 15 15:07:08 2010 -0800
    162  1.1.1.2       mrg 
    163  1.1.1.2       mrg     Update Sun license notices to current X.Org standard form
    164  1.1.1.2       mrg     
    165  1.1.1.2       mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    166  1.1.1.2       mrg 
    167  1.1.1.2       mrg commit 41591e982529a47cce8cbb8705a360c95cf76914
    168  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    169  1.1.1.2       mrg Date:   Tue Dec 15 22:01:02 2009 -0500
    170  1.1.1.2       mrg 
    171  1.1.1.2       mrg     configure.ac: remove unused sdkdir=$(pkg-config...) statement
    172  1.1.1.2       mrg     
    173  1.1.1.2       mrg     The sdkdir variable isn't use, so remove the statement.
    174  1.1.1.2       mrg     
    175  1.1.1.2       mrg     Acked-by: Dan Nicholson <dbn.lists (a] gmail.com>
    176  1.1.1.2       mrg     
    177  1.1.1.2       mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    178  1.1.1.2       mrg 
    179  1.1.1.2       mrg commit 5b29cc8ca27522d25dcfb9216824ecdbd5870601
    180  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    181  1.1.1.2       mrg Date:   Mon Nov 23 09:25:06 2009 -0500
    182  1.1.1.2       mrg 
    183  1.1.1.2       mrg     Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
    184  1.1.1.2       mrg     
    185  1.1.1.2       mrg     Now that the INSTALL file is generated.
    186  1.1.1.2       mrg     Allows running make maintainer-clean.
    187  1.1.1.2       mrg 
    188  1.1.1.2       mrg commit 049a5b39f0c22e56e405b7fd57633aede75b9634
    189  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    190  1.1.1.2       mrg Date:   Wed Oct 28 14:41:41 2009 -0400
    191  1.1.1.2       mrg 
    192  1.1.1.2       mrg     INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
    193  1.1.1.2       mrg     
    194  1.1.1.2       mrg     Automake 'foreign' option is specified in configure.ac.
    195  1.1.1.2       mrg     Remove from Makefile.am
    196  1.1.1.2       mrg 
    197  1.1.1.2       mrg commit 0a68d33d6fdc8119869bae778cdb9fae196ed652
    198  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    199  1.1.1.2       mrg Date:   Wed Oct 28 14:09:09 2009 -0400
    200  1.1.1.2       mrg 
    201  1.1.1.2       mrg     INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
    202  1.1.1.2       mrg     
    203  1.1.1.2       mrg     Add missing INSTALL file. Use standard GNU file on building tarball
    204  1.1.1.2       mrg     README may have been updated
    205  1.1.1.2       mrg     Remove AUTHORS file as it is empty and no content available yet.
    206  1.1.1.2       mrg     Remove NEWS file as it is empty and no content available yet.
    207  1.1.1.2       mrg 
    208  1.1.1.2       mrg commit b65c79395c4e7d54c55894e4c2dfd47b0df9c785
    209  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    210  1.1.1.2       mrg Date:   Mon Oct 26 12:54:22 2009 -0400
    211  1.1.1.2       mrg 
    212  1.1.1.2       mrg     Several driver modules do not have a ChangeLog target in Makefile.am #23814
    213  1.1.1.2       mrg     
    214  1.1.1.2       mrg     The git generated ChangeLog replaces the hand written one.
    215  1.1.1.2       mrg     Update configure.ac to xorg-macros level 1.3.
    216  1.1.1.2       mrg     Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
    217  1.1.1.2       mrg     Update Makefile.am to add ChangeLog target if missing
    218  1.1.1.2       mrg     Remove ChangeLog from EXTRA_DIST or *CLEAN variables
    219  1.1.1.2       mrg     This is a pre-req for the INSTALL_CMD
    220  1.1.1.2       mrg 
    221  1.1.1.2       mrg commit d7849069734c731951e2708dc552e7fb55293dd5
    222  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    223  1.1.1.2       mrg Date:   Thu Oct 22 12:34:18 2009 -0400
    224  1.1.1.2       mrg 
    225  1.1.1.2       mrg     .gitignore: use common defaults with custom section # 24239
    226  1.1.1.2       mrg     
    227  1.1.1.2       mrg     Using common defaults will reduce errors and maintenance.
    228  1.1.1.2       mrg     Only the very small or inexistent custom section need periodic maintenance
    229  1.1.1.2       mrg     when the structure of the component changes. Do not edit defaults.
    230  1.1.1.2       mrg 
    231  1.1.1.2       mrg commit a0bbebcbd8cb77580327829e9bfc7bb1edaa851e
    232  1.1.1.2       mrg Author: Denis Gilmore <dennis (a] ausil.us>
    233  1.1.1.2       mrg Date:   Tue Sep 8 15:35:37 2009 +1000
    234  1.1.1.2       mrg 
    235  1.1.1.2       mrg     sunffb: define %g2 and %g3 registers when building 64 bit version of the sunffb driver
    236  1.1.1.2       mrg 
    237  1.1.1.2       mrg commit 2e5762537082ee14425e16db53a5f9e5c5f81f70
    238  1.1.1.2       mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    239  1.1.1.2       mrg Date:   Mon Sep 7 11:12:13 2009 -0400
    240  1.1.1.2       mrg 
    241  1.1.1.2       mrg     xf86-video-sunffb: Remove unused .cvsignore file #23776
    242  1.1.1.2       mrg     
    243  1.1.1.2       mrg     Signed-off-by: Peter Hutterer <peter.hutterer (a] who-t.net>
    244  1.1.1.2       mrg 
    245  1.1.1.2       mrg commit 03b1a6d6d92e8f751c93cc7996e26d929d02f3b0
    246  1.1.1.2       mrg Author: Dave Airlie <airlied (a] redhat.com>
    247  1.1.1.2       mrg Date:   Mon Sep 7 15:10:03 2009 +1000
    248  1.1.1.2       mrg 
    249  1.1.1.2       mrg     sunffb 1.2.1
    250  1.1.1.2       mrg 
    251  1.1.1.2       mrg commit ecf5ecebcfc3ec6490111876895ab3a67197e565
    252  1.1.1.2       mrg Author: Peter Hutterer <peter.hutterer (a] who-t.net>
    253  1.1.1.2       mrg Date:   Thu Jul 16 12:44:57 2009 +1000
    254  1.1.1.2       mrg 
    255  1.1.1.2       mrg     Update to xextproto 7.1 support.
    256  1.1.1.2       mrg     
    257  1.1.1.2       mrg     DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
    258  1.1.1.2       mrg     need to include dpmsconst.h if xextproto 7.1 is available.
    259  1.1.1.2       mrg     
    260  1.1.1.2       mrg     Signed-off-by: Peter Hutterer <peter.hutterer (a] who-t.net>
    261  1.1.1.2       mrg 
    262  1.1.1.2       mrg commit 4f881efe2ec8ae4def01014f9acf7400e93a807f
    263  1.1.1.2       mrg Author: Julien Cristau <jcristau (a] debian.org>
    264  1.1.1.2       mrg Date:   Mon May 4 18:39:10 2009 +0200
    265  1.1.1.2       mrg 
    266  1.1.1.2       mrg     Remove DRI remnants from build system
    267  1.1.1.2       mrg 
    268  1.1.1.2       mrg commit 330e87f2a5c26aedc9b8f204a7e713f0a3aa3773
    269  1.1.1.2       mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    270  1.1.1.2       mrg Date:   Fri Jan 30 21:04:20 2009 -0800
    271  1.1.1.2       mrg 
    272  1.1.1.2       mrg     Add README with pointers to mailing list, bugzilla & git repos
    273  1.1.1.2       mrg 
    274  1.1.1.2       mrg commit 55b1ad67715c9af1a652bc893b072ed0cf8d94c0
    275  1.1.1.2       mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    276  1.1.1.2       mrg Date:   Fri Jan 9 16:35:58 2009 -0800
    277  1.1.1.2       mrg 
    278  1.1.1.2       mrg     Remove xorgconfig & xorgcfg from See Also list in man page
    279  1.1.1.2       mrg 
    280  1.1.1.2       mrg commit 18c56ae8c3f5bbb133db426e9c253d47bb72a0d4
    281  1.1.1.2       mrg Author: Adam Jackson <ajax (a] redhat.com>
    282  1.1.1.2       mrg Date:   Wed Sep 3 15:35:42 2008 -0400
    283  1.1.1.2       mrg 
    284  1.1.1.2       mrg     sunffb 1.2.0
    285  1.1.1.2       mrg 
    286  1.1.1.2       mrg commit a58df3038b1913b54ca2e8ebb19ff23a7c7d1e6a
    287  1.1.1.2       mrg Author: Adam Jackson <ajax (a] redhat.com>
    288  1.1.1.2       mrg Date:   Wed Sep 3 15:35:22 2008 -0400
    289  1.1.1.2       mrg 
    290  1.1.1.2       mrg     Fix distcheck.
    291  1.1.1.2       mrg 
    292  1.1.1.2       mrg commit 54c2addfceb3d8336268fa4ffcd65c418da72b0d
    293  1.1.1.2       mrg Author: Adam Jackson <ajax (a] redhat.com>
    294  1.1.1.2       mrg Date:   Tue Aug 19 10:25:43 2008 -0400
    295  1.1.1.2       mrg 
    296  1.1.1.2       mrg     Uninclude xf86Version.h
    297  1.1.1.2       mrg 
    298  1.1.1.2       mrg commit 3ac0f6635abba7550e84c2becab544bf321fb285
    299  1.1.1.2       mrg Author: Matthieu Herrb <matthieu.herrb (a] laas.fr>
    300  1.1.1.2       mrg Date:   Sat Mar 8 23:57:47 2008 +0100
    301  1.1.1.2       mrg 
    302  1.1.1.2       mrg     Makefile.am: nuke RCS Id
    303  1.1.1.2       mrg 
    304  1.1.1.2       mrg commit bd8ef525a9421d21468fb006fe98173bbac7e274
    305  1.1.1.2       mrg Author: Benjamin Close <Benjamin.Close (a] clearchain.com>
    306  1.1.1.2       mrg Date:   Thu Jan 10 10:22:09 2008 +1030
    307  1.1.1.2       mrg 
    308  1.1.1.2       mrg     Fix compilation after dri removal in the last commit
    309  1.1.1.2       mrg     
    310  1.1.1.2       mrg     Found by: Tinderbox
    311  1.1.1.2       mrg 
    312  1.1.1.2       mrg commit 843d93e775cd46a0e24e1a725594fa2d942f14ba
    313  1.1.1.2       mrg Author: David S. Miller <davem (a] davemloft.net>
    314  1.1.1.2       mrg Date:   Fri Dec 28 23:55:06 2007 +0200
    315  1.1.1.2       mrg 
    316  1.1.1.2       mrg     Remove DRI support to fix build after devPrivates rework
    317  1.1.1.2       mrg     
    318  1.1.1.2       mrg     This driver uses devprivates of all kinds, but this is
    319  1.1.1.2       mrg     only done in deprecated and unused code so we can simply
    320  1.1.1.2       mrg     remove it all.
    321  1.1.1.2       mrg     
    322  1.1.1.2       mrg     DRM/DRI support has been commented out for years, and was
    323  1.1.1.2       mrg     done during the conversion over to XAA acceleration.  This
    324  1.1.1.2       mrg     code would need to be essentially rewritten to work again,
    325  1.1.1.2       mrg     so we can just remove this stuff for now.
    326  1.1.1.2       mrg     
    327  1.1.1.2       mrg     The rest were either:
    328  1.1.1.2       mrg     
    329  1.1.1.2       mrg     1) DRI/DRM related uses
    330  1.1.1.2       mrg     2) the private allocation code
    331  1.1.1.2       mrg     3) cases that could index to the pScrn to get the FFB private
    332  1.1.1.2       mrg     
    333  1.1.1.2       mrg     And that's all fixed up here.
    334  1.1.1.2       mrg     
    335  1.1.1.2       mrg     Signed-off-by: David S. Miller <davem (a] davemloft.net>
    336  1.1.1.2       mrg 
    337  1.1.1.2       mrg commit 5c1e059cfed608b1f051cc8825c1243db76e8995
    338  1.1.1.2       mrg Author: Brice Goglin <bgoglin (a] debian.org>
    339  1.1.1.2       mrg Date:   Tue Aug 7 13:53:20 2007 +0200
    340  1.1.1.2       mrg 
    341  1.1.1.2       mrg     Define FFB_*_VERSION using PACKAGE_VERSION*
    342  1.1.1.2       mrg 
    343  1.1.1.2       mrg commit 697a0195476c9a65b5ee17ccca3eab60439ffdad
    344  1.1.1.2       mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    345  1.1.1.2       mrg Date:   Thu Mar 1 11:04:01 2007 -0800
    346  1.1.1.2       mrg 
    347  1.1.1.2       mrg     renamed: .cvsignore -> .gitignore
    348  1.1.1.2       mrg 
    349  1.1.1.2       mrg commit b86a3f4662d384e3a3540340bfd5171ab2523c34
    350  1.1.1.2       mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    351  1.1.1.2       mrg Date:   Thu Mar 1 11:03:41 2007 -0800
    352  1.1.1.2       mrg 
    353  1.1.1.2       mrg     modified: man/sunffb.man
    354  1.1.1.2       mrg 
    355  1.1.1.2       mrg commit 57dcab65e95003ecabc25fbc4b3c01b8558538fa
    356  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    357  1.1.1.2       mrg Date:   Fri Apr 7 21:27:00 2006 +0000
    358  1.1.1.2       mrg 
    359  1.1.1.2       mrg     Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
    360  1.1.1.2       mrg 
    361  1.1.1.2       mrg commit 78d80c93260b9a67c65b12cb5cf4c4e624efc144
    362  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    363  1.1.1.2       mrg Date:   Thu Jan 26 03:26:06 2006 +0000
    364  1.1.1.2       mrg 
    365  1.1.1.2       mrg     Remove remaining cfb-isms and dead accel code.
    366  1.1.1.2       mrg 
    367  1.1.1.2       mrg commit 214eb92d43214e206cdb38e72ae0f5c667b5d29f
    368  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    369  1.1.1.2       mrg Date:   Wed Jan 25 22:53:12 2006 +0000
    370  1.1.1.2       mrg 
    371  1.1.1.2       mrg     Remove xf8_32wid damage, it is going away.
    372  1.1.1.2       mrg 
    373  1.1.1.2       mrg commit 19dd5927079ac262d45660907f336e8838bad374
    374  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    375  1.1.1.2       mrg Date:   Wed Dec 21 02:30:03 2005 +0000
    376  1.1.1.2       mrg 
    377  1.1.1.2       mrg     Update package version for X11R7 release.
    378  1.1.1.2       mrg 
    379  1.1.1.2       mrg commit defa4b890adf74f8036fe0e7fe35eef9ca38faf4
    380  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    381  1.1.1.2       mrg Date:   Mon Dec 19 16:25:55 2005 +0000
    382  1.1.1.2       mrg 
    383  1.1.1.2       mrg     Stub COPYING files
    384  1.1.1.2       mrg 
    385  1.1.1.2       mrg commit 8aaf8c1f61e8528eaa12179509900251ae4893e8
    386  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    387  1.1.1.2       mrg Date:   Thu Dec 15 00:24:20 2005 +0000
    388  1.1.1.2       mrg 
    389  1.1.1.2       mrg     Update package version number for final X11R7 release candidate.
    390  1.1.1.2       mrg 
    391  1.1.1.2       mrg commit 05917a2d030d8359b2a30f471e7100bc020d5a3f
    392  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    393  1.1.1.2       mrg Date:   Wed Dec 14 20:42:18 2005 +0000
    394  1.1.1.2       mrg 
    395  1.1.1.2       mrg     Bug #4890" Include the assembly in the build (Ferris McCormick)
    396  1.1.1.2       mrg 
    397  1.1.1.2       mrg commit da7b74edb223745fc38dce3d3107a00784714f03
    398  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    399  1.1.1.2       mrg Date:   Tue Dec 6 22:48:39 2005 +0000
    400  1.1.1.2       mrg 
    401  1.1.1.2       mrg     Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
    402  1.1.1.2       mrg 
    403  1.1.1.2       mrg commit 1bf0231995e8ad32a839854d08d8f3bdc3a385dd
    404  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    405  1.1.1.2       mrg Date:   Sat Dec 3 05:49:35 2005 +0000
    406  1.1.1.2       mrg 
    407  1.1.1.2       mrg     Update package version number for X11R7 RC3 release.
    408  1.1.1.2       mrg 
    409  1.1.1.2       mrg commit dd99c53ed663b390f497a4a8032ab795fd0cba4b
    410  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    411  1.1.1.2       mrg Date:   Fri Dec 2 02:16:10 2005 +0000
    412  1.1.1.2       mrg 
    413  1.1.1.2       mrg     Remove extraneous AC_MSG_RESULT.
    414  1.1.1.2       mrg 
    415  1.1.1.2       mrg commit 23f5a1d4c6cbd7a2ab130cedbf7a785ba518d69d
    416  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    417  1.1.1.2       mrg Date:   Wed Nov 30 18:51:52 2005 +0000
    418  1.1.1.2       mrg 
    419  1.1.1.2       mrg     Bump libdrm dep to 2.0.
    420  1.1.1.2       mrg 
    421  1.1.1.2       mrg commit bcf2a2c5eb91537c33f1838d8591916badc89d74
    422  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    423  1.1.1.2       mrg Date:   Tue Nov 29 23:30:04 2005 +0000
    424  1.1.1.2       mrg 
    425  1.1.1.2       mrg     Only build dlloader modules by default.
    426  1.1.1.2       mrg 
    427  1.1.1.2       mrg commit a0f33f27d401967657ce0ed037b6591d84060e99
    428  1.1.1.2       mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    429  1.1.1.2       mrg Date:   Mon Nov 28 22:04:13 2005 +0000
    430  1.1.1.2       mrg 
    431  1.1.1.2       mrg     Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
    432  1.1.1.2       mrg         update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
    433  1.1.1.2       mrg 
    434  1.1.1.2       mrg commit 625bfc14e7bc3bc10f4c7f9abdc1c5df217d94fc
    435  1.1.1.2       mrg Author: Eric Anholt <anholt (a] freebsd.org>
    436  1.1.1.2       mrg Date:   Mon Nov 21 10:49:19 2005 +0000
    437  1.1.1.2       mrg 
    438  1.1.1.2       mrg     Add .cvsignores for drivers.
    439  1.1.1.2       mrg 
    440  1.1.1.2       mrg commit 5bc8aaccae7475e21fc9fc97651c2076f96e9483
    441  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    442  1.1.1.2       mrg Date:   Wed Nov 9 21:31:21 2005 +0000
    443  1.1.1.2       mrg 
    444  1.1.1.2       mrg     Bump version numbers for X11R6.9/X11R7 RC2.
    445  1.1.1.2       mrg 
    446  1.1.1.2       mrg commit 43e39abb4c9bf91e5218a73ed4bb74c2acf6ce56
    447  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    448  1.1.1.2       mrg Date:   Wed Nov 9 21:15:21 2005 +0000
    449  1.1.1.2       mrg 
    450  1.1.1.2       mrg     Update package version number for X11R7 RC2 release.
    451  1.1.1.2       mrg 
    452  1.1.1.2       mrg commit 2803b5c7c60eed0202098924bd7614df66a98ddd
    453  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    454  1.1.1.2       mrg Date:   Tue Nov 1 15:08:55 2005 +0000
    455  1.1.1.2       mrg 
    456  1.1.1.2       mrg     Update pkgcheck depedencies to work with separate build roots.
    457  1.1.1.2       mrg 
    458  1.1.1.2       mrg commit 51f8f302cfd06be9398d04e326ace75662b0504d
    459  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    460  1.1.1.2       mrg Date:   Fri Oct 21 18:40:19 2005 +0000
    461  1.1.1.2       mrg 
    462  1.1.1.2       mrg     Bug #4829: Remove some useless DRI symbol checks.
    463  1.1.1.2       mrg 
    464  1.1.1.2       mrg commit 3648fd25fe2c38ef70a86ea090e3566793d823a1
    465  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    466  1.1.1.2       mrg Date:   Wed Oct 19 02:48:05 2005 +0000
    467  1.1.1.2       mrg 
    468  1.1.1.2       mrg     Update package version number for RC1 release.
    469  1.1.1.2       mrg 
    470  1.1.1.2       mrg commit 1b43194ffc88097b5a5906d7b1e02da3ef4c3d73
    471  1.1.1.2       mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    472  1.1.1.2       mrg Date:   Tue Oct 18 00:01:54 2005 +0000
    473  1.1.1.2       mrg 
    474  1.1.1.2       mrg     Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
    475  1.1.1.2       mrg         substitutions to work better with BSD make
    476  1.1.1.2       mrg 
    477  1.1.1.2       mrg commit 39077f5188e3d24692a34b628966dd6f6ffdc6ee
    478  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    479  1.1.1.2       mrg Date:   Mon Oct 17 22:57:36 2005 +0000
    480  1.1.1.2       mrg 
    481  1.1.1.2       mrg     More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
    482  1.1.1.2       mrg         of indirectly
    483  1.1.1.2       mrg 
    484  1.1.1.2       mrg commit b59dd8a3ba59fa7ea117e239a55847dc723163c9
    485  1.1.1.2       mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    486  1.1.1.2       mrg Date:   Mon Oct 17 00:09:06 2005 +0000
    487  1.1.1.2       mrg 
    488  1.1.1.2       mrg     Use sed & cpp to substitute variables in driver man pages
    489  1.1.1.2       mrg 
    490  1.1.1.2       mrg commit 047c415b8f094d6fbcc24d09bc70bd02959b9ffc
    491  1.1.1.2       mrg Author: Sren Sandmann Pedersen <sandmann (a] daimi.au.dk>
    492  1.1.1.2       mrg Date:   Tue Sep 27 22:22:16 2005 +0000
    493  1.1.1.2       mrg 
    494  1.1.1.2       mrg     Add some files to the rendition and sunffb build systems
    495  1.1.1.2       mrg 
    496  1.1.1.2       mrg commit 45a0e677c8332c19e003cd85caa22b6f8376ab1f
    497  1.1.1.2       mrg Author: Felix Kuehling <fxkuehl (a] gmx.de>
    498  1.1.1.2       mrg Date:   Thu Sep 22 14:20:53 2005 +0000
    499  1.1.1.2       mrg 
    500  1.1.1.2       mrg     Fixed DRI detection in the sunffb configure script. Without this DRI was
    501  1.1.1.2       mrg         not detected properly. As a result DRM include paths were missing on
    502  1.1.1.2       mrg         the compiler command line and the build failed if DRI was enabled in
    503  1.1.1.2       mrg         the Xorg server. Committing after no feedback from the xorg-modular
    504  1.1.1.2       mrg         list in over a week. If it breaks something, feel free to revert this
    505  1.1.1.2       mrg         and revoke my commit rights. ;-)
    506  1.1.1.2       mrg 
    507  1.1.1.2       mrg commit 71d1b743cab6e93ef33bcb840f2da6e0068dfac2
    508  1.1.1.2       mrg Author: Daniel Stone <daniel (a] fooishbar.org>
    509  1.1.1.2       mrg Date:   Thu Aug 18 09:03:50 2005 +0000
    510  1.1.1.2       mrg 
    511  1.1.1.2       mrg     Update autogen.sh to one that does objdir != srcdir.
    512  1.1.1.2       mrg 
    513  1.1.1.2       mrg commit 4bdcfaaa58cc36d156ca94b55b3f9ac9ceb113ec
    514  1.1.1.2       mrg Author: Alan Hourihane <alanh (a] fairlite.demon.co.uk>
    515  1.1.1.2       mrg Date:   Mon Aug 15 07:30:05 2005 +0000
    516  1.1.1.2       mrg 
    517  1.1.1.2       mrg     Egbert's 64bit fixes for mixed 32/64bit clients
    518  1.1.1.2       mrg 
    519  1.1.1.2       mrg commit 56b87a3418a34b8f9290e87675c244e7de781dd4
    520  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    521  1.1.1.2       mrg Date:   Sun Jul 31 17:19:29 2005 +0000
    522  1.1.1.2       mrg 
    523  1.1.1.2       mrg     Post-merge fixups:
    524  1.1.1.2       mrg     - Disable building the gamma driver
    525  1.1.1.2       mrg     - Fix numerous Imakefiles to get header paths and subdirs right
    526  1.1.1.2       mrg     - Symlink client-side GLX lib source from Mesa
    527  1.1.1.2       mrg     - Add new shader subdirs to the Mesa core build
    528  1.1.1.2       mrg     - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it,
    529  1.1.1.2       mrg         since they don't generate protocol, and it was breaking the build.
    530  1.1.1.2       mrg 
    531  1.1.1.2       mrg commit 72d32dd10f53317b9dadde67e723327cc2018a16
    532  1.1.1.2       mrg Author: Kevin E Martin <kem (a] kem.org>
    533  1.1.1.2       mrg Date:   Fri Jul 29 21:22:45 2005 +0000
    534  1.1.1.2       mrg 
    535  1.1.1.2       mrg     Various changes preparing packages for RC0:
    536  1.1.1.2       mrg     - Verify and update package version numbers as needed
    537  1.1.1.2       mrg     - Implement versioning scheme
    538  1.1.1.2       mrg     - Change bug address to point to bugzilla bug entry form
    539  1.1.1.2       mrg     - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
    540  1.1.1.2       mrg         reenable it)
    541  1.1.1.2       mrg     - Fix makedepend to use pkgconfig and pass distcheck
    542  1.1.1.2       mrg     - Update build script to build macros first
    543  1.1.1.2       mrg     - Update modular Xorg version
    544  1.1.1.2       mrg 
    545  1.1.1.2       mrg commit d2b894704751df14f61e0b63333f4b2d89ca8e4e
    546  1.1.1.2       mrg Author: Sren Sandmann Pedersen <sandmann (a] daimi.au.dk>
    547  1.1.1.2       mrg Date:   Wed Jul 27 21:23:29 2005 +0000
    548  1.1.1.2       mrg 
    549  1.1.1.2       mrg     Add xf86driproto to dependencies for drivers with DRI support. Patch from
    550  1.1.1.2       mrg         Donnie Berkholz
    551  1.1.1.2       mrg 
    552  1.1.1.2       mrg commit 1aaf55726f4f85b24d24458dfca9d463df01bc15
    553  1.1.1.2       mrg Author: Sren Sandmann Pedersen <sandmann (a] daimi.au.dk>
    554  1.1.1.2       mrg Date:   Tue Jul 26 23:36:05 2005 +0000
    555  1.1.1.2       mrg 
    556  1.1.1.2       mrg     Build system for sunffb
    557  1.1.1.2       mrg 
    558  1.1.1.2       mrg commit 52138352933072b2f38e5b6de4ed4b11c0212732
    559  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    560  1.1.1.2       mrg Date:   Mon Jul 11 02:30:01 2005 +0000
    561  1.1.1.2       mrg 
    562  1.1.1.2       mrg     Prep for modular builds by adding guarded #include "config.h" everywhere.
    563  1.1.1.2       mrg 
    564  1.1.1.2       mrg commit 39421243b0318ce2e9c10a93d1b9dbd4ff5b4411
    565  1.1.1.2       mrg Author: Daniel Stone <daniel (a] fooishbar.org>
    566  1.1.1.2       mrg Date:   Sun Jul 3 08:53:43 2005 +0000
    567  1.1.1.2       mrg 
    568  1.1.1.2       mrg     Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
    569  1.1.1.2       mrg 
    570  1.1.1.2       mrg commit 95f88d487422b022457a1d2f2611b10b77ed9b46
    571  1.1.1.2       mrg Author: Daniel Stone <daniel (a] fooishbar.org>
    572  1.1.1.2       mrg Date:   Sun Jul 3 07:01:27 2005 +0000
    573  1.1.1.2       mrg 
    574  1.1.1.2       mrg     Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
    575  1.1.1.2       mrg     Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
    576  1.1.1.2       mrg     Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    577  1.1.1.2       mrg         source files in the xserver/xorg tree, predicated on defines of
    578  1.1.1.2       mrg         HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    579  1.1.1.2       mrg         <X11/fonts/foo.h>.
    580  1.1.1.2       mrg 
    581  1.1.1.2       mrg commit 632161e98ed1ce857d572d8b65bbd8be3bc5a15a
    582  1.1.1.2       mrg Author: Daniel Stone <daniel (a] fooishbar.org>
    583  1.1.1.2       mrg Date:   Fri Jul 1 22:43:21 2005 +0000
    584  1.1.1.2       mrg 
    585  1.1.1.2       mrg     Change all misc.h and os.h references to <X11/foo.h>.
    586  1.1.1.2       mrg 
    587  1.1.1.2       mrg commit a0644204d1fa8413f20a701fe00b89ca1ba49d04
    588  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    589  1.1.1.2       mrg Date:   Sat Jun 25 21:16:56 2005 +0000
    590  1.1.1.2       mrg 
    591  1.1.1.2       mrg     Bug #3626: _X_EXPORT tags for video and input drivers.
    592  1.1.1.2       mrg 
    593  1.1.1.2       mrg commit e5efbae7842e99b4f5d7a8cf322fa91fde5b343b
    594  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    595  1.1.1.2       mrg Date:   Fri May 20 16:15:02 2005 +0000
    596  1.1.1.2       mrg 
    597  1.1.1.2       mrg     Bug #3346: Don't include DRI-internal headers from the drivers. Pointed out
    598  1.1.1.2       mrg         by Kevin Martin.
    599  1.1.1.2       mrg 
    600  1.1.1.2       mrg commit 6c9a3742c576454eb7f56433c3196968bc73a991
    601  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    602  1.1.1.2       mrg Date:   Wed May 18 17:47:36 2005 +0000
    603  1.1.1.2       mrg 
    604  1.1.1.2       mrg     Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
    605  1.1.1.2       mrg         number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
    606  1.1.1.2       mrg         version number. Modify DRIQueryVersion to return the libdri version
    607  1.1.1.2       mrg         number, which all DDXes were requesting implicitly. Fix the DDXes to
    608  1.1.1.2       mrg         check for the DRIINFO version they were compiled against.
    609  1.1.1.2       mrg 
    610  1.1.1.2       mrg commit 74b13899c20fcbe5030fbf6891e3931a2de9b50f
    611  1.1.1.2       mrg Author: Daniel Stone <daniel (a] fooishbar.org>
    612  1.1.1.2       mrg Date:   Wed Apr 20 12:25:30 2005 +0000
    613  1.1.1.2       mrg 
    614  1.1.1.2       mrg     Fix includes right throughout the Xserver tree:
    615  1.1.1.2       mrg     change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
    616  1.1.1.2       mrg     change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    617  1.1.1.2       mrg         <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
    618  1.1.1.2       mrg     change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
    619  1.1.1.2       mrg 
    620  1.1.1.2       mrg commit f4d45d198607956fb059941905b990be952fd33f
    621  1.1.1.2       mrg Author: Adam Jackson <ajax (a] nwnk.net>
    622  1.1.1.2       mrg Date:   Fri Jan 14 06:08:03 2005 +0000
    623  1.1.1.2       mrg 
    624  1.1.1.2       mrg     Bug #1891: XAA support for Sun FFB. (Dave S. Miller)
    625  1.1.1.2       mrg 
    626  1.1.1.2       mrg commit 7c14b1189ac8605de9be3d85c338563396bb9c06
    627  1.1.1.2       mrg Author: Eric Anholt <anholt (a] freebsd.org>
    628  1.1.1.2       mrg Date:   Wed Jun 16 09:44:00 2004 +0000
    629  1.1.1.2       mrg 
    630  1.1.1.2       mrg     Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
    631  1.1.1.2       mrg         with the following notes:
    632  1.1.1.2       mrg     - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
    633  1.1.1.2       mrg         insecurity.
    634  1.1.1.2       mrg     - VIA driver converted to new drmContext and drmHandle names.
    635  1.1.1.2       mrg     - Radeon driver merge conflicted in many places, and MergedFB at least
    636  1.1.1.2       mrg         could probably use some checking at this point.
    637  1.1.1.2       mrg 
    638  1.1.1.2       mrg commit f47ae0017ff8c7fa8ec7c5a9da7e3d5775ee2673
    639  1.1.1.2       mrg Author: Eric Anholt <anholt (a] freebsd.org>
    640  1.1.1.2       mrg Date:   Wed Jun 16 09:27:15 2004 +0000
    641  1.1.1.2       mrg 
    642  1.1.1.2       mrg     DRI trunk-20040613 import
    643  1.1.1.2       mrg 
    644  1.1.1.2       mrg commit a302d3993349aeec3fbf3bf753e1e7d57519b300
    645  1.1.1.2       mrg Author: Eric Anholt <anholt (a] freebsd.org>
    646  1.1.1.2       mrg Date:   Wed Jun 16 09:23:59 2004 +0000
    647  1.1.1.2       mrg 
    648  1.1.1.2       mrg     DRI XFree86-4_3_99_12-merge import
    649  1.1.1.2       mrg 
    650  1.1.1.2       mrg commit e04839d52cadd3b08c48d86d7416d28e7c89427c
    651  1.1.1.2       mrg Author: Egbert Eich <eich (a] suse.de>
    652  1.1.1.2       mrg Date:   Fri Apr 23 19:48:17 2004 +0000
    653  1.1.1.2       mrg 
    654  1.1.1.2       mrg     Merging XORG-CURRENT into trunk
    655  1.1.1.2       mrg 
    656  1.1.1.2       mrg commit 73d194647e988fa127f73c989fb233fab78a03fc
    657  1.1.1.2       mrg Author: Egbert Eich <eich (a] suse.de>
    658  1.1.1.2       mrg Date:   Sun Mar 14 08:33:37 2004 +0000
    659  1.1.1.2       mrg 
    660  1.1.1.2       mrg     Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
    661  1.1.1.2       mrg 
    662  1.1.1.2       mrg commit a0f5bdc28ef96f2a7c8c8c2a74fc6decef974702
    663  1.1.1.2       mrg Author: Egbert Eich <eich (a] suse.de>
    664  1.1.1.2       mrg Date:   Wed Mar 3 12:12:25 2004 +0000
    665  1.1.1.2       mrg 
    666  1.1.1.2       mrg     Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
    667  1.1.1.2       mrg 
    668  1.1.1.2       mrg commit 8f3d03cefe870b257186d6c874eb62f4805cb228
    669  1.1.1.2       mrg Author: Egbert Eich <eich (a] suse.de>
    670  1.1.1.2       mrg Date:   Thu Feb 26 13:35:55 2004 +0000
    671  1.1.1.2       mrg 
    672  1.1.1.2       mrg     readding XFree86's cvs IDs
    673  1.1.1.2       mrg 
    674  1.1.1.2       mrg commit 3ab17ec38c3f6c072884cc677677b95bfd84d293
    675  1.1.1.2       mrg Author: Egbert Eich <eich (a] suse.de>
    676  1.1.1.2       mrg Date:   Thu Feb 26 09:23:27 2004 +0000
    677  1.1.1.2       mrg 
    678  1.1.1.2       mrg     Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
    679  1.1.1.2       mrg 
    680  1.1.1.2       mrg commit 00f21f357a123a981d1ffaedc8e3a24b17f07cb0
    681  1.1.1.2       mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
    682  1.1.1.2       mrg Date:   Tue Nov 25 19:28:42 2003 +0000
    683  1.1.1.2       mrg 
    684  1.1.1.2       mrg     XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
    685  1.1.1.2       mrg 
    686  1.1.1.2       mrg commit d9ee679d756a1151893c58620ba396c0f2b3bdbf
    687  1.1.1.2       mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
    688  1.1.1.2       mrg Date:   Fri Nov 14 16:48:55 2003 +0000
    689  1.1.1.2       mrg 
    690  1.1.1.2       mrg     XFree86 4.3.0.1
    691  1.1.1.2       mrg 
    692  1.1.1.2       mrg commit 68c56916d79bf06e26e01c3e84206edc928d9b51
    693  1.1.1.2       mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
    694  1.1.1.2       mrg Date:   Fri Nov 14 16:48:55 2003 +0000
    695  1.1.1.2       mrg 
    696  1.1.1.2       mrg     Initial revision
    697