diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 21:13:22 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 21:13:22 +0000 |
| commit | 254f18b17b0985d80eff367e557adb53b1168661 (patch) | |
| tree | da174a01caa50b35f11d4dc412473686590022ac /o3d | |
| parent | 02127f8772c83c5e53f66a9ad8267d4b343f8007 (diff) | |
| download | chromium_src-254f18b17b0985d80eff367e557adb53b1168661.zip chromium_src-254f18b17b0985d80eff367e557adb53b1168661.tar.gz chromium_src-254f18b17b0985d80eff367e557adb53b1168661.tar.bz2 | |
Linux: Adding conflicts with the ubuntu package
Review URL: http://codereview.chromium.org/155710
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/installer/linux/debian_amd64/control | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/o3d/installer/linux/debian_amd64/control b/o3d/installer/linux/debian_amd64/control index 76e780c..8a3b6f8 100644 --- a/o3d/installer/linux/debian_amd64/control +++ b/o3d/installer/linux/debian_amd64/control @@ -8,6 +8,8 @@ Standards-Version: 3.7.2 Package: google-o3d Architecture: amd64 Depends: ia32-libs, libc6-i386, lib32stdc++6, lib32gcc1, lib32z1, nspluginwrapper +Conflicts: o3d-plugin +Replaces: o3d-plugin Description: Google O3D Plugin O3D is an open-source web API for creating rich, interactive 3D applications in the browser. |