summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2011-04-11 13:19:25 -0700
committerAaron Plattner <aplattner@nvidia.com>2011-04-11 13:19:25 -0700
commit36c40d1d3e08860bc300d951287f4755b7c88849 (patch)
treef007f85f5ddf2138010a50ba104782faa4b0f3bc
parent4ba8655ff4786a8bbcea3b8d160e0b433456eab4 (diff)
270.41.03270.41.03
-rw-r--r--command-list.c2
-rw-r--r--version.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/command-list.c b/command-list.c
index 9558ba6..514d86e 100644
--- a/command-list.c
+++ b/command-list.c
@@ -578,6 +578,7 @@ static ConflictingFileInfo __xfree86_libs[] = {
{ "libvdpau_nvidia.", 16, /* strlen("libvdpau_nvidia.") */ NULL },
{ "libnvidia-compiler.", 19, /* strlen("libnvidia-compiler.") */ NULL },
{ "libnvcuvid.", 11, /* strlen("libnvcuvid.") */ NULL },
+ { "libnvidia-ml.", 13, /* strlen("libnvidia-ml.") */ NULL },
{ NULL, 0, NULL }
};
@@ -623,6 +624,7 @@ static ConflictingFileInfo __opengl_libs[] = {
{ "libnvidia-cfg.", 14, /* strlen("libnvidia-cfg.") */ NULL },
{ "libcuda.", 8, /* strlen("libcuda.") */ NULL },
{ "libnvidia-compiler.", 19, /* strlen("libnvidia-compiler.") */ NULL },
+ { "libnvidia-ml.", 13, /* strlen("libnvidia-ml.") */ NULL },
{ NULL, 0, NULL }
};
diff --git a/version.mk b/version.mk
index 932bd33..442d27d 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 270.30
+NVIDIA_VERSION = 270.41.03