proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-14 17:54:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
Sylvestre Ledru 2013-09-05 10:09:57 +00:00
parent 27d8448809
commit 7dd20e404a
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/control vendored
View File

@ -225,15 +225,9 @@ Description: clang library - Development package
Package: libclang-common-3.4-dev Package: libclang-common-3.4-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
<<<<<<< .courant Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version})
Depends: ${misc:Depends}, libllvm3.4 (= ${binary:Version})
Replaces: llvm-3.4-dev (<< 1:3.2repack), libclang-3.4-dev Replaces: llvm-3.4-dev (<< 1:3.2repack), libclang-3.4-dev
Breaks: llvm-3.4-dev (<< 1:3.2repack) Breaks: llvm-3.4-dev (<< 1:3.2repack)
=======
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.3 (= ${binary:Version})
Replaces: llvm-3.3-dev (<< 1:3.2repack), libclang-3.3-dev
Breaks: llvm-3.3-dev (<< 1:3.2repack)
>>>>>>> .fusion-droit.r834
Description: clang library - Common development package Description: clang library - Common development package
Clang project is a C, C++, Objective C and Objective C++ front-end Clang project is a C, C++, Objective C and Objective C++ front-end
for the LLVM compiler. Some of its goals include the following: for the LLVM compiler. Some of its goals include the following: