mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-12-29 06:52:34 +03:00
merge
This commit is contained in:
commit
8ca771d262
@ -65,7 +65,6 @@
|
||||
</option>
|
||||
<option id="gnu.cpp.link.option.libs.1177721357" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
|
||||
<listOptionValue builtIn="false" value="dstruct"/>
|
||||
<listOptionValue builtIn="false" value="rt"/>
|
||||
<listOptionValue builtIn="false" value="flm"/>
|
||||
<listOptionValue builtIn="false" value="oolm"/>
|
||||
<listOptionValue builtIn="false" value="lattice"/>
|
||||
@ -90,7 +89,11 @@
|
||||
>>>>>>> db005f6503a5179e0427b460d8039e8920c8d65b
|
||||
=======
|
||||
<listOptionValue builtIn="false" value="bz2"/>
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> eeeda717a41b41db784564c88020f15a2f5bef57
|
||||
=======
|
||||
<listOptionValue builtIn="false" value="rt"/>
|
||||
>>>>>>> 44a0e52e3052371a850f7ee463279f4cc0522ea5
|
||||
</option>
|
||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.128214028" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
||||
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
|
||||
|
Loading…
Reference in New Issue
Block a user