Module Name: src
Committed By: kre
Date: Sun Jan 27 05:03:57 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/nouveau: files.nouveau
Log Message:
Fix merge botch
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/nouveau/files.nouveau
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/nouveau/files.nouveau
diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.24 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.25
--- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.24 Sun Jan 27 02:08:43 2019
+++ src/sys/external/bsd/drm2/nouveau/files.nouveau Sun Jan 27 05:03:57 2019
@@ -1,6 +1,4 @@
-# $NetBSD: files.nouveau,v 1.24 2019/01/27 02:08:43 pgoyette Exp $
-
-version 20180827
+# $NetBSD: files.nouveau,v 1.25 2019/01/27 05:03:57 kre Exp $
version 20180827
