From 86107893935411c151b1b611cb6d3e4f405b7779 Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Fri, 25 Aug 2017 22:21:17 +0200
Subject: Attend to merfe with Master

---
 nbproject/configurations.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'nbproject')

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>
-- 
cgit 1.2.3-korg