diff options
author | Jeff Hartmann <jhartmann@valinux.com> | 2000-03-16 03:37:30 +0000 |
---|---|---|
committer | Jeff Hartmann <jhartmann@valinux.com> | 2000-03-16 03:37:30 +0000 |
commit | 5bd8014f276d447178a1193d9dea1b976647d6ce (patch) | |
tree | cafe59205a3cf689f2efc31f2c8da11ce2c53e3e /linux/Makefile.linux | |
parent | adc03d3661117a687b5e1686f11b4b1314922203 (diff) |
Merge with 4.0ati-4-0-1-20000319-baseX_4_0-20000315-merge
Diffstat (limited to 'linux/Makefile.linux')
-rw-r--r-- | linux/Makefile.linux | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/Makefile.linux b/linux/Makefile.linux index 0f14540d9..8a41f880b 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -24,8 +24,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. # -# $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/generic/Makefile.linux,v 1.23 1999/07/02 17:46:30 faith Exp $ -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.5 2000/02/14 06:27:25 martin Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.6 2000/02/23 04:47:25 martin Exp $ # .SUFFIXES: |