Skip to content
Snippets Groups Projects
Commit 9075e110 authored by Oz Linden's avatar Oz Linden
Browse files

fix merge error in open source configurations to disable proprietary components

parent fe22feea
No related branches found
No related tags found
No related merge requests found
......@@ -2393,7 +2393,7 @@
<string>-G</string>
<string>"Visual Studio 10"</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
<string>-DFMOD=FALSE</string>
</array>
......@@ -2469,7 +2469,7 @@
<string>-G</string>
<string>"Visual Studio 10"</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
<string>-DFMOD=FALSE</string>
</array>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment