Merge branch 'master' of git.sourceforge.jp:/gitroot/openi2cradio/OpenI2CRadio into...

[openi2cradio/OpenI2CRadio.git] / nbproject / configurations.xml

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 4bfe95c..071c199 100644 (file)
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -62,6 +62,11 @@
     <itemPath>iodef_i2c.h</itemPath>
     <itemPath>iodef_key.h</itemPath>
     <itemPath>iodef_amp.h</itemPath>
+<<<<<<< HEAD
+=======
+    <itemPath>i2c_eeprom.c</itemPath>
+    <itemPath>i2c_eeprom.h</itemPath>
+>>>>>>> 4c1f43368e7898c61b942060f0c5937c34cbc543
     <itemPath>backlight.c</itemPath>
     <itemPath>backlight.h</itemPath>
   </logicalFolder>
@@ -103,8 +108,70 @@
         <makeCustomizationNormalizeHexFile>true</makeCustomizationNormalizeHexFile>
       </makeCustomizationType>
       <HI-TECH-COMP>
+<<<<<<< HEAD
       </HI-TECH-COMP>
       <HI-TECH-LINK>
+=======
+        <property key="asmlist" value="true"/>
+        <property key="define-macros" value=""/>
+        <property key="extra-include-directories" value=""/>
+        <property key="identifier-length" value="255"/>
+        <property key="operation-mode" value="free"/>
+        <property key="opt-xc8-compiler-strict_ansi" value="false"/>
+        <property key="optimization-assembler" value="true"/>
+        <property key="optimization-assembler-files" value="true"/>
+        <property key="optimization-debug" value="false"/>
+        <property key="optimization-global" value="true"/>
+        <property key="optimization-level" value="9"/>
+        <property key="optimization-set" value="default"/>
+        <property key="optimization-speed" value="false"/>
+        <property key="preprocess-assembler" value="true"/>
+        <property key="undefine-macros" value=""/>
+        <property key="use-cci" value="false"/>
+        <property key="verbose" value="false"/>
+        <property key="warning-level" value="0"/>
+        <property key="what-to-do" value="require"/>
+      </HI-TECH-COMP>
+      <HI-TECH-LINK>
+        <property key="additional-options-checksum" value=""/>
+        <property key="additional-options-code-offset" value=""/>
+        <property key="additional-options-command-line" value=""/>
+        <property key="additional-options-errata" value=""/>
+        <property key="additional-options-extend-address" value="false"/>
+        <property key="additional-options-trace-type" value=""/>
+        <property key="additional-options-use-response-files" value="false"/>
+        <property key="backup-reset-condition-flags" value="false"/>
+        <property key="calibrate-oscillator" value="true"/>
+        <property key="calibrate-oscillator-value" value=""/>
+        <property key="clear-bss" value="true"/>
+        <property key="code-model-external" value="wordwrite"/>
+        <property key="code-model-rom" value=""/>
+        <property key="create-html-files" value="false"/>
+        <property key="data-model-ram" value=""/>
+        <property key="data-model-size-of-double" value="24"/>
+        <property key="data-model-size-of-float" value="24"/>
+        <property key="display-class-usage" value="false"/>
+        <property key="display-hex-usage" value="false"/>
+        <property key="display-overall-usage" value="true"/>
+        <property key="display-psect-usage" value="false"/>
+        <property key="fill-flash-options-addr" value=""/>
+        <property key="fill-flash-options-const" value=""/>
+        <property key="fill-flash-options-how" value="0"/>
+        <property key="fill-flash-options-inc-const" value="1"/>
+        <property key="fill-flash-options-increment" value=""/>
+        <property key="fill-flash-options-seq" value=""/>
+        <property key="fill-flash-options-what" value="0"/>
+        <property key="format-hex-file-for-download" value="false"/>
+        <property key="initialize-data" value="true"/>
+        <property key="keep-generated-startup.as" value="false"/>
+        <property key="link-in-c-library" value="true"/>
+        <property key="link-in-peripheral-library" value="true"/>
+        <property key="managed-stack" value="false"/>
+        <property key="opt-xc8-linker-file" value="false"/>
+        <property key="opt-xc8-linker-link_startup" value="false"/>
+        <property key="opt-xc8-linker-serial" value=""/>
+        <property key="program-the-device-with-default-config-words" value="false"/>
+>>>>>>> 4c1f43368e7898c61b942060f0c5937c34cbc543
       </HI-TECH-LINK>
       <PICkit3PlatformTool>
         <property key="AutoSelectMemRanges" value="auto"/>
@@ -141,13 +208,22 @@
       <XC8-config-global>
       </XC8-config-global>
       <item path="akc6955.c" ex="false" overriding="false">
-        <sdcc>
-        </sdcc>
+        <HI-TECH-COMP>
+        </HI-TECH-COMP>
+        <HI-TECH-LINK>
+        </HI-TECH-LINK>
+        <XC8-config-global>
+        </XC8-config-global>
       </item>
       <item path="idle.c" ex="false" overriding="false">
-        <sdcc>
-        </sdcc>
+        <HI-TECH-COMP>
+        </HI-TECH-COMP>
+        <HI-TECH-LINK>
+        </HI-TECH-LINK>
+        <XC8-config-global>
+        </XC8-config-global>
       </item>
+<<<<<<< HEAD
       <sdcc>
         <property key="V-show-commands-compiler" value="true"/>
         <property key="Werror" value="false"/>
@@ -167,6 +243,8 @@
         <property key="verbose" value="true"/>
         <appendMe value="libio18f45k20.lib libdev18f45k20.lib libc18f.lib"/>
       </sdcc>
+=======
+>>>>>>> 4c1f43368e7898c61b942060f0c5937c34cbc543
     </conf>
   </confs>
 </configurationDescriptor>