diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2010-09-28 13:14:51 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2010-09-28 13:14:51 -0700 |
| commit | f2fb01961579041379a86b96e4f904fd26232749 (patch) | |
| tree | 4ba04d7d59a9ebdbdddcf36372df5cedf4149c8c /command-list.c | |
| parent | d1c2f0df019026813015a44cb5a9ccf425b3d214 (diff) | |
260.19.04260.19.04
Diffstat (limited to 'command-list.c')
| -rw-r--r-- | command-list.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/command-list.c b/command-list.c index a83908d..9558ba6 100644 --- a/command-list.c +++ b/command-list.c @@ -577,6 +577,7 @@ static ConflictingFileInfo __xfree86_libs[] = { { "libvdpau_trace.", 15, /* strlen("libvdpau_trace.") */ NULL }, { "libvdpau_nvidia.", 16, /* strlen("libvdpau_nvidia.") */ NULL }, { "libnvidia-compiler.", 19, /* strlen("libnvidia-compiler.") */ NULL }, + { "libnvcuvid.", 11, /* strlen("libnvcuvid.") */ NULL }, { NULL, 0, NULL } }; |