diff options
| author |   Fulup Ar Foll <fulup@iot.bzh> | 2017-08-25 22:21:17 +0200 |
|---|---|---|
| committer |   Romain Forlot <romain.forlot@iot.bzh> | 2018-12-13 15:02:25 +0100 |
| commit | 86107893935411c151b1b611cb6d3e4f405b7779 (patch) | |
| tree | 7c45bd6ac4f729d030095be50f30fc073a6a0763 /nbproject | |
| parent | 16722cbe2859ce2a03343073e25d8755abdf2cf9 (diff) | |
Attend to merfe with Master
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/configurations.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index a3d914b..172a65b 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -30,6 +30,7 @@ <in>feature_tests.cxx</in> </df> </df> +<<<<<<< Updated upstream <df name="ctl-binding"> <in>ctl-binding.c</in> <in>ctl-dispatch.c</in> @@ -39,6 +40,8 @@ <df name="ctl-plugin"> <in>ctl-plugin-sample.c</in> </df> +======= +>>>>>>> Stashed changes </df> <logicalFolder name="ExternalFiles" displayName="Important Files" @@ -107,8 +110,12 @@ <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem> <Elem>CONTROL_SUPPORT_LUA</Elem> <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem> +<<<<<<< Updated upstream <Elem>NATIVE_LINUX</Elem> <Elem>controller_EXPORTS</Elem> +======= + <Elem>control_afb_EXPORTS</Elem> +>>>>>>> Stashed changes </preprocessorList> </cTool> </item> @@ -226,6 +233,7 @@ </item> <item path="build/CMakeFiles/feature_tests.cxx" ex="false" tool="1" flavor2="4"> </item> +<<<<<<< Updated upstream <item path="ctl-binding/ctl-binding.c" ex="false" tool="0" flavor2="0"> <cTool flags="0"> </cTool> @@ -246,6 +254,8 @@ <cTool flags="0"> </cTool> </item> +======= +>>>>>>> Stashed changes <folder path="0/build"> <cTool> <incDir> @@ -253,6 +263,7 @@ </incDir> </cTool> </folder> +<<<<<<< Updated upstream <folder path="0/ctl-binding"> <cTool> <incDir> @@ -309,6 +320,8 @@ </preprocessorList> </cTool> </folder> +======= +>>>>>>> Stashed changes </conf> </confs> </configurationDescriptor> |