]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
SCREW that conflict.
authorBrian West <brian@freeswitch.org>
Wed, 8 Mar 2006 20:33:10 +0000 (20:33 +0000)
committerBrian West <brian@freeswitch.org>
Wed, 8 Mar 2006 20:33:10 +0000 (20:33 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@814 d0543943-73ff-0310-b7d9-9358b9ac24b2

freeswitch.xcodeproj/brian.mode1
freeswitch.xcodeproj/brian.pbxuser
freeswitch.xcodeproj/project.pbxproj

index 7498032d1c0fe5742f61edf39e2252fd5ea9f723..cfdfc728f4c0727746aec9e5561be0c378416820 100644 (file)
                                <string>active-target-popup</string>
                                <string>action</string>
                                <string>NSToolbarFlexibleSpaceItem</string>
-                               <string>build</string>
-                               <string>clean</string>
-                               <string>clean-target</string>
-                               <string>com.apple.ide.PBXToolbarStopButton</string>
-                               <string>run</string>
-                               <string>build-and-run</string>
+                               <string>buildOrClean</string>
                                <string>build-and-runOrDebug</string>
+                               <string>com.apple.ide.PBXToolbarStopButton</string>
                                <string>get-info</string>
                                <string>toggle-editor</string>
                                <string>NSToolbarFlexibleSpaceItem</string>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
                                                        <array>
                                                                <string>D3A7637E09BEAAEE002E9B53</string>
-                                                               <string>D30F70DB09BF6E9D00A494C4</string>
-                                                               <string>D30F70DC09BF6EA800A494C4</string>
                                                                <string>1C37FBAC04509CD000000102</string>
-<<<<<<< .mine
-                                                               <string>D30F712C09BF75AC00A494C4</string>
-                                                               <string>D30F712D09BF75AC00A494C4</string>
-=======
-                                                               <string>D3C7A96609BF6AA5009127A4</string>
->>>>>>> .r812
+                                                               <string>1C37FAAC04509CD000000102</string>
+                                                               <string>1C37FABC05509CD000000102</string>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-<<<<<<< .mine
-                                                                       <integer>39</integer>
-=======
-                                                                       <integer>6</integer>
->>>>>>> .r812
+                                                                       <integer>20</integer>
+                                                                       <integer>19</integer>
                                                                </array>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
                                                        <real>368</real>
                                                </array>
                                                <key>RubberWindowFrame</key>
-                                               <string>94 157 1491 871 0 0 1680 1028 </string>
+                                               <string>228 149 1491 871 0 0 1680 1028 </string>
                                        </dict>
                                        <key>Module</key>
                                        <string>PBXSmartGroupTreeModule</string>
                                                                <key>Frame</key>
                                                                <string>{{0, 0}, {1101, 0}}</string>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>94 157 1491 871 0 0 1680 1028 </string>
+                                                               <string>228 149 1491 871 0 0 1680 1028 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>PBXNavigatorGroup</string>
                                                                <key>Frame</key>
                                                                <string>{{0, 5}, {1101, 825}}</string>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>94 157 1491 871 0 0 1680 1028 </string>
+                                                               <string>228 149 1491 871 0 0 1680 1028 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>XCDetailModule</string>
                        </array>
                        <key>TableOfContents</key>
                        <array>
-<<<<<<< .mine
-                               <string>D30F711A09BF728500A494C4</string>
-=======
-                               <string>D3C7A95109BF69FC009127A4</string>
->>>>>>> .r812
+                               <string>D31D4A4109BEBE2D001112B8</string>
                                <string>1CE0B1FE06471DED0097A5F4</string>
-<<<<<<< .mine
-                               <string>D30F711B09BF728500A494C4</string>
-=======
-                               <string>D3C7A95209BF69FC009127A4</string>
->>>>>>> .r812
+                               <string>D31D4A4209BEBE2D001112B8</string>
                                <string>1CE0B20306471E060097A5F4</string>
                                <string>1CE0B20506471E060097A5F4</string>
                        </array>
                <string>/Users/brian/freeswitch/freeswitch.xcodeproj</string>
        </array>
        <key>WindowString</key>
-       <string>94 157 1491 871 0 0 1680 1028 </string>
+       <string>228 149 1491 871 0 0 1680 1028 </string>
        <key>WindowTools</key>
        <array>
                <dict>
                                                        <string>88pt</string>
                                                </dict>
                                                <dict>
+                                                       <key>BecomeActive</key>
+                                                       <true/>
                                                        <key>ContentConfiguration</key>
                                                        <dict>
                                                                <key>PBXBuildLogShowsTranscriptDefaultKey</key>
-                                                               <string>{{0, 5}, {1435, 613}}</string>
+                                                               <string>{{0, 154}, {1435, 464}}</string>
                                                                <key>PBXProjectModuleGUID</key>
                                                                <string>XCMainBuildResultsModuleGUID</string>
                                                                <key>PBXProjectModuleLabel</key>
                        <key>TableOfContents</key>
                        <array>
                                <string>D3A763A109BEAC72002E9B53</string>
-<<<<<<< .mine
-                               <string>D30F711C09BF728600A494C4</string>
-=======
-                               <string>D3C7A95309BF69FC009127A4</string>
->>>>>>> .r812
+                               <string>D31D4A4309BEBE2D001112B8</string>
                                <string>1CD0528F0623707200166675</string>
                                <string>XCMainBuildResultsModuleGUID</string>
                        </array>
                        <key>WindowToolGUID</key>
                        <string>D3A763A109BEAC72002E9B53</string>
                        <key>WindowToolIsVisible</key>
-                       <false/>
+                       <true/>
                </dict>
                <dict>
-                       <key>FirstTimeWindowDisplayed</key>
-                       <false/>
                        <key>Identifier</key>
                        <string>windowTool.debugger</string>
-                       <key>IsVertical</key>
-                       <true/>
                        <key>Layout</key>
                        <array>
                                <dict>
                                                                                <string>yes</string>
                                                                                <key>sizes</key>
                                                                                <array>
-                                                                                       <string>{{0, 0}, {455, 210}}</string>
-                                                                                       <string>{{455, 0}, {597, 210}}</string>
+                                                                                       <string>{{0, 0}, {317, 164}}</string>
+                                                                                       <string>{{317, 0}, {377, 164}}</string>
                                                                                </array>
                                                                        </dict>
                                                                        <key>VerticalSplitView</key>
                                                                                <string>yes</string>
                                                                                <key>sizes</key>
                                                                                <array>
-                                                                                       <string>{{0, 0}, {1052, 210}}</string>
-                                                                                       <string>{{0, 210}, {1052, 296}}</string>
+                                                                                       <string>{{0, 0}, {694, 164}}</string>
+                                                                                       <string>{{0, 164}, {694, 216}}</string>
                                                                                </array>
                                                                        </dict>
                                                                </dict>
                                                                <key>DebugSTDIOWindowFrame</key>
                                                                <string>{{200, 200}, {500, 300}}</string>
                                                                <key>Frame</key>
-                                                               <string>{{0, 0}, {1052, 506}}</string>
+                                                               <string>{{0, 0}, {694, 380}}</string>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>155 412 1052 547 0 0 1680 1028 </string>
+                                                               <string>321 238 694 422 0 0 1440 878 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>PBXDebugSessionModule</string>
                                                        <key>Proportion</key>
-                                                       <string>506pt</string>
+                                                       <string>100%</string>
                                                </dict>
                                        </array>
                                        <key>Proportion</key>
-                                       <string>506pt</string>
+                                       <string>100%</string>
                                </dict>
                        </array>
                        <key>Name</key>
                                <string>PBXDebugSessionModule</string>
                        </array>
                        <key>StatusbarIsVisible</key>
-                       <true/>
+                       <integer>1</integer>
                        <key>TableOfContents</key>
                        <array>
                                <string>1CD10A99069EF8BA00B06720</string>
-                               <string>D3C7A76009BF4AFE009127A4</string>
+                               <string>1C0AD2AB069F1E9B00FABCE6</string>
                                <string>1C162984064C10D400B95A72</string>
-                               <string>D3C7A76109BF4AFE009127A4</string>
-                               <string>D3C7A76209BF4AFE009127A4</string>
-                               <string>D3C7A76309BF4AFE009127A4</string>
-                               <string>D3C7A76409BF4AFE009127A4</string>
-                               <string>D3C7A76509BF4AFE009127A4</string>
-                               <string>D3C7A76609BF4AFE009127A4</string>
+                               <string>1C0AD2AC069F1E9B00FABCE6</string>
                        </array>
                        <key>ToolbarConfiguration</key>
                        <string>xcode.toolbar.config.debug</string>
                        <key>WindowString</key>
-                       <string>155 412 1052 547 0 0 1680 1028 </string>
+                       <string>321 238 694 422 0 0 1440 878 </string>
                        <key>WindowToolGUID</key>
                        <string>1CD10A99069EF8BA00B06720</string>
                        <key>WindowToolIsVisible</key>
-                       <false/>
+                       <integer>0</integer>
                </dict>
                <dict>
                        <key>Identifier</key>
                        <string>MENUSEPARATOR</string>
                </dict>
                <dict>
-                       <key>FirstTimeWindowDisplayed</key>
-                       <false/>
                        <key>Identifier</key>
                        <string>windowTool.debuggerConsole</string>
-                       <key>IsVertical</key>
-                       <true/>
                        <key>Layout</key>
                        <array>
                                <dict>
                                        <key>Dock</key>
                                        <array>
                                                <dict>
+                                                       <key>BecomeActive</key>
+                                                       <integer>1</integer>
                                                        <key>ContentConfiguration</key>
                                                        <dict>
                                                                <key>PBXProjectModuleGUID</key>
                                                                <key>Frame</key>
                                                                <string>{{0, 0}, {440, 358}}</string>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>176 536 440 400 0 0 1680 1028 </string>
+                                                               <string>650 41 440 400 0 0 1280 1002 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>PBXDebugCLIModule</string>
                                                </dict>
                                        </array>
                                        <key>Proportion</key>
-                                       <string>359pt</string>
+                                       <string>358pt</string>
                                </dict>
                        </array>
                        <key>Name</key>
                                <string>PBXDebugCLIModule</string>
                        </array>
                        <key>StatusbarIsVisible</key>
-                       <true/>
+                       <integer>1</integer>
                        <key>TableOfContents</key>
                        <array>
-                               <string>D3C7A76709BF4AFE009127A4</string>
-                               <string>D3C7A76809BF4AFE009127A4</string>
+                               <string>1C78EAAD065D492600B07095</string>
+                               <string>1C78EAAE065D492600B07095</string>
                                <string>1C78EAAC065D492600B07095</string>
                        </array>
                        <key>WindowString</key>
-                       <string>176 536 440 400 0 0 1680 1028 </string>
-                       <key>WindowToolGUID</key>
-                       <string>D3C7A76709BF4AFE009127A4</string>
-                       <key>WindowToolIsVisible</key>
-                       <false/>
+                       <string>650 41 440 400 0 0 1280 1002 </string>
                </dict>
                <dict>
                        <key>FirstTimeWindowDisplayed</key>
                                                        <key>GeometryConfiguration</key>
                                                        <dict>
                                                                <key>Frame</key>
-                                                               <string>{{0, 0}, {1430, 785}}</string>
+                                                               <string>{{0, 0}, {1013, 335}}</string>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>239 115 1430 826 0 0 1680 1028 </string>
+                                                               <string>135 606 1013 376 0 0 1680 1028 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>PBXRunSessionModule</string>
                                                        <key>Proportion</key>
-                                                       <string>785pt</string>
+                                                       <string>335pt</string>
                                                </dict>
                                        </array>
                                        <key>Proportion</key>
-                                       <string>785pt</string>
+                                       <string>335pt</string>
                                </dict>
                        </array>
                        <key>Name</key>
                        <key>TableOfContents</key>
                        <array>
                                <string>1C0AD2B3069F1EA900FABCE6</string>
-<<<<<<< .mine
-                               <string>D30F712409BF745A00A494C4</string>
-=======
-                               <string>D3C7A95409BF69FC009127A4</string>
->>>>>>> .r812
+                               <string>D31D509C09BECC0E001112B8</string>
                                <string>1CD0528B0623707200166675</string>
-<<<<<<< .mine
-                               <string>D30F712509BF745A00A494C4</string>
-=======
-                               <string>D3C7A95509BF69FC009127A4</string>
->>>>>>> .r812
+                               <string>D31D509D09BECC0E001112B8</string>
                        </array>
                        <key>ToolbarConfiguration</key>
                        <string>xcode.toolbar.config.run</string>
                        <key>WindowString</key>
-                       <string>239 115 1430 826 0 0 1680 1028 </string>
+                       <string>135 606 1013 376 0 0 1680 1028 </string>
                        <key>WindowToolGUID</key>
                        <string>1C0AD2B3069F1EA900FABCE6</string>
                        <key>WindowToolIsVisible</key>
                        <false/>
                </dict>
                <dict>
-                       <key>FirstTimeWindowDisplayed</key>
-                       <false/>
                        <key>Identifier</key>
                        <string>windowTool.breakpoints</string>
                        <key>IsVertical</key>
-                       <false/>
+                       <integer>0</integer>
                        <key>Layout</key>
                        <array>
                                <dict>
                                        <key>Dock</key>
                                        <array>
                                                <dict>
+                                                       <key>BecomeActive</key>
+                                                       <integer>1</integer>
                                                        <key>ContentConfiguration</key>
                                                        <dict>
                                                                <key>PBXBottomSmartGroupGIDs</key>
                                                                        <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
                                                                        <array>
                                                                                <string>1C77FABC04509CD000000102</string>
-                                                                               <string>1C3E0DCA080725EA00A55177</string>
-                                                                               <string>1C3E0DCC080725EA11A45113</string>
                                                                        </array>
                                                                        <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                                        <array>
                                                                                <array>
-                                                                                       <integer>1</integer>
                                                                                        <integer>0</integer>
                                                                                </array>
                                                                        </array>
                                                                <key>PBXTopSmartGroupGIDs</key>
                                                                <array/>
                                                                <key>XCIncludePerspectivesSwitch</key>
-                                                               <false/>
+                                                               <integer>0</integer>
                                                        </dict>
                                                        <key>GeometryConfiguration</key>
                                                        <dict>
                                                                        <real>168</real>
                                                                </array>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>176 527 744 409 0 0 1680 1028 </string>
+                                                               <string>315 424 744 409 0 0 1440 878 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>PBXSmartGroupTreeModule</string>
                                                        <string>185pt</string>
                                                </dict>
                                                <dict>
-                                                       <key>BecomeActive</key>
-                                                       <true/>
                                                        <key>ContentConfiguration</key>
                                                        <dict>
                                                                <key>PBXProjectModuleGUID</key>
                                                                <key>Frame</key>
                                                                <string>{{190, 0}, {554, 368}}</string>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>176 527 744 409 0 0 1680 1028 </string>
+                                                               <string>315 424 744 409 0 0 1440 878 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>XCDetailModule</string>
                                <string>XCDetailModule</string>
                        </array>
                        <key>StatusbarIsVisible</key>
-                       <true/>
+                       <integer>1</integer>
                        <key>TableOfContents</key>
                        <array>
-                               <string>D3C7A7F609BF58E5009127A4</string>
-                               <string>D3C7A7F709BF58E5009127A4</string>
+                               <string>1CDDB66807F98D9800BB5817</string>
+                               <string>1CDDB66907F98D9800BB5817</string>
                                <string>1CE0B1FE06471DED0097A5F4</string>
                                <string>1CA1AED706398EBD00589147</string>
                        </array>
                        <key>ToolbarConfiguration</key>
                        <string>xcode.toolbar.config.breakpoints</string>
                        <key>WindowString</key>
-                       <string>176 527 744 409 0 0 1680 1028 </string>
+                       <string>315 424 744 409 0 0 1440 878 </string>
                        <key>WindowToolGUID</key>
-                       <string>D3C7A7F609BF58E5009127A4</string>
+                       <string>1CDDB66807F98D9800BB5817</string>
                        <key>WindowToolIsVisible</key>
-                       <false/>
+                       <integer>1</integer>
                </dict>
                <dict>
                        <key>Identifier</key>
index 4fc1b7cb8c9aabd17473095cbc2b9a034233b53b..f090426cb006eecd1d50afb21128c0e85cd5fe1f 100644 (file)
@@ -1,62 +1,20 @@
 // !$*UTF8*$!
 {
-<<<<<<< .mine
-       D30F70E109BF6ECA00A494C4 /* mod_echo.dylib */ = {
-               activeExec = 0;
-       };
        D31D4A4A09BEBF01001112B8 /* libapr.dylib */ = {
                activeExec = 0;
-=======
-       D31D503409BECA2B001112B8 /* switch_console.c */ = {
-               uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1011, 2464}}";
-                       sepNavSelRange = "{4693, 0}";
-                       sepNavVisRect = "{{0, 0}, {1011, 264}}";
-               };
->>>>>>> .r812
        };
-       D31D503509BECA2B001112B8 /* switch_core.c */ = {
-               uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1332, 32074}}";
-                       sepNavSelRange = "{0, 0}";
-                       sepNavVisRect = "{{0, 0}, {1332, 762}}";
-                       sepNavWindowFrame = "{{84, 69}, {1371, 891}}";
-               };
+       D31D4DEF09BEC3A1001112B8 /* libapr.a */ = {
+               activeExec = 0;
        };
-       D31D503609BECA2B001112B8 /* switch_event.c */ = {
-               uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {728, 7896}}";
-                       sepNavSelRange = "{4599, 0}";
-                       sepNavVisRect = "{{0, 2266}, {653, 187}}";
-               };
+       D31D4E7909BEC533001112B8 /* libapr-util.dylib */ = {
+               activeExec = 0;
        };
-       D31D503809BECA2B001112B8 /* switch_loadable_module.c */ = {
-               uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1332, 8022}}";
-                       sepNavSelRange = "{12382, 1}";
-                       sepNavVisRect = "{{0, 5139}, {1332, 762}}";
-                       sepNavWindowFrame = "{{160, 126}, {1371, 891}}";
-               };
+       D31D4FB509BEC85A001112B8 /* libapr-util.a */ = {
+               activeExec = 0;
        };
        D31D504109BECA92001112B8 /* libfreeswitch.dylib */ = {
                activeExec = 0;
        };
-       D31D505409BECAED001112B8 /* switch_loadable_module.h */ = {
-               uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1332, 3066}}";
-                       sepNavSelRange = "{0, 0}";
-                       sepNavVisRect = "{{0, 0}, {1332, 762}}";
-                       sepNavWindowFrame = "{{38, 111}, {1371, 891}}";
-               };
-       };
-       D31D505C09BECAED001112B8 /* switch_version.h */ = {
-               uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1332, 762}}";
-                       sepNavSelRange = "{0, 0}";
-                       sepNavVisRect = "{{0, 0}, {1332, 762}}";
-                       sepNavWindowFrame = "{{15, 132}, {1371, 891}}";
-               };
-       };
        D31D508F09BECBA3001112B8 /* freeswitch */ = {
                activeExec = 0;
                executables = (
                environmentEntries = (
                );
                executableSystemSymbolLevel = 0;
-               executableUserSymbolLevel = 3;
+               executableUserSymbolLevel = 0;
                libgmallocEnabled = 0;
                name = freeswitch;
-               savedGlobals = {
-               };
                sourceDirectories = (
                );
        };
-       D31D509709BECBE3001112B8 /* switch.c */ = {
-               uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {668, 2912}}";
-                       sepNavSelRange = "{4334, 0}";
-                       sepNavVisRect = "{{0, 2603}, {653, 187}}";
-                       sepNavWindowFrame = "{{61, 90}, {1371, 891}}";
-               };
-       };
-       D346F17909BF38AE00404918 /* mod_echo.dylib */ = {
-               activeExec = 0;
-       };
        D3A7638009BEAAEE002E9B53 /* Project object */ = {
                activeBuildConfigurationName = Debug;
                activeBuildStyle = D31D4A3209BEBE12001112B8 /* Development */;
                activeExecutable = D31D509109BECBA3001112B8 /* freeswitch */;
                activeTarget = D3A763FE09BEB271002E9B53 /* All */;
                addToTargets = (
-<<<<<<< .mine
-                       D30F70E109BF6ECA00A494C4 /* mod_echo.dylib */,
-=======
->>>>>>> .r812
+                       D31D508F09BECBA3001112B8 /* freeswitch */,
                );
                breakpoints = (
+                       D3A7673709BEBAFE002E9B53 /* build.c:29 */,
                );
                breakpointsGroup = D3A763CD09BEAF2B002E9B53 /* XCBreakpointsBucket */;
                codeSenseManager = D3A7638509BEAAEE002E9B53 /* Code sense */;
                        D31D509109BECBA3001112B8 /* freeswitch */,
                );
                perUserDictionary = {
-                       "PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = {
-                               PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-                               PBXFileTableDataSourceColumnSortingKey = PBXBreakpointsDataSource_LocationID;
-                               PBXFileTableDataSourceColumnWidthsKey = (
-                                       20,
-                                       20,
-                                       210,
-                                       20,
-                                       110,
-                                       109,
-                                       20,
-                               );
-                               PBXFileTableDataSourceColumnsKey = (
-                                       PBXBreakpointsDataSource_ActionID,
-                                       PBXBreakpointsDataSource_TypeID,
-                                       PBXBreakpointsDataSource_BreakpointID,
-                                       PBXBreakpointsDataSource_UseID,
-                                       PBXBreakpointsDataSource_LocationID,
-                                       PBXBreakpointsDataSource_ConditionID,
-                                       PBXBreakpointsDataSource_ContinueID,
-                               );
-                       };
                        PBXConfiguration.PBXFileTableDataSource3.PBXErrorsWarningsDataSource = {
                                PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
                                PBXFileTableDataSourceColumnSortingKey = PBXErrorsWarningsDataSource_LocationID;
                                PBXFileTableDataSourceColumnWidthsKey = (
                                        20,
-                                       801,
-                                       251,
+                                       537,
+                                       200,
                                );
                                PBXFileTableDataSourceColumnsKey = (
                                        PBXErrorsWarningsDataSource_TypeID,
                                PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
                                PBXFileTableDataSourceColumnWidthsKey = (
                                        20,
-                                       315,
+                                       862,
                                        20,
                                        48,
                                        43,
                                PBXFileTableDataSourceColumnSortingKey = PBXFindDataSource_LocationID;
                                PBXFileTableDataSourceColumnWidthsKey = (
                                        200,
-                                       876,
+                                       120,
                                );
                                PBXFileTableDataSourceColumnsKey = (
                                        PBXFindDataSource_MessageID,
                                        PBXFindDataSource_LocationID,
                                );
                        };
-                       PBXConfiguration.PBXFileTableDataSource3.PBXSymbolsDataSource = {
-                               PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-                               PBXFileTableDataSourceColumnSortingKey = PBXSymbolsDataSource_SymbolNameID;
-                               PBXFileTableDataSourceColumnWidthsKey = (
-                                       16,
-                                       200,
-                                       50,
-                                       802,
-                               );
-                               PBXFileTableDataSourceColumnsKey = (
-                                       PBXSymbolsDataSource_SymbolTypeIconID,
-                                       PBXSymbolsDataSource_SymbolNameID,
-                                       PBXSymbolsDataSource_SymbolTypeID,
-                                       PBXSymbolsDataSource_ReferenceNameID,
-                               );
-                       };
-                       PBXConfiguration.PBXFileTableDataSource3.XCSCMDataSource = {
-                               PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-                               PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-                               PBXFileTableDataSourceColumnWidthsKey = (
-                                       20,
-                                       20,
-                                       838,
-                                       20,
-                                       48,
-                                       43,
-                                       43,
-                                       20,
-                               );
-                               PBXFileTableDataSourceColumnsKey = (
-                                       PBXFileDataSource_SCM_ColumnID,
-                                       PBXFileDataSource_FiletypeID,
-                                       PBXFileDataSource_Filename_ColumnID,
-                                       PBXFileDataSource_Built_ColumnID,
-                                       PBXFileDataSource_ObjectSize_ColumnID,
-                                       PBXFileDataSource_Errors_ColumnID,
-                                       PBXFileDataSource_Warnings_ColumnID,
-                                       PBXFileDataSource_Target_ColumnID,
-                               );
-                       };
                        PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
                                PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
                                PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-<<<<<<< .mine
-                       PBXPerProjectTemplateStateSaveDate = 163541522;
-                       PBXWorkspaceStateSaveDate = 163541522;
-=======
-                       PBXPerProjectTemplateStateSaveDate = 163539282;
-                       PBXWorkspaceStateSaveDate = 163539282;
->>>>>>> .r812
+                       PBXPerProjectTemplateStateSaveDate = 163499686;
+                       PBXWorkspaceStateSaveDate = 163499686;
                };
                sourceControlManager = D3A7638409BEAAEE002E9B53 /* Source Control */;
                userBuildSettings = {
                isa = PBXCodeSenseManager;
                indexTemplatePath = "";
        };
+       D3A7639209BEAB96002E9B53 /* libresample.a */ = {
+               activeExec = 0;
+       };
+       D3A763AB09BEAD21002E9B53 /* config.h */ = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {1332, 762}}";
+                       sepNavSelRange = "{0, 0}";
+                       sepNavVisRect = "{{0, 0}, {1332, 762}}";
+                       sepNavWindowFrame = "{{15, 132}, {1371, 891}}";
+               };
+       };
        D3A763CD09BEAF2B002E9B53 /* XCBreakpointsBucket */ = {
                isa = XCBreakpointsBucket;
                name = "Project Breakpoints";
                objects = (
+                       D3A7673709BEBAFE002E9B53 /* build.c:29 */,
                );
        };
-       D3A763FE09BEB271002E9B53 /* All */ = {
+       D3A763F209BEB1CF002E9B53 /* libteletone.a */ = {
                activeExec = 0;
        };
-       D3C7A71E09BF4674009127A4 /* mod_bridgecall.c */ = {
-               uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1332, 1414}}";
-                       sepNavSelRange = "{0, 0}";
-                       sepNavVisRect = "{{0, 262}, {1332, 762}}";
-                       sepNavWindowFrame = "{{181, 123}, {1371, 891}}";
-               };
-       };
-       D3C7A72209BF467F009127A4 /* mod_bridgecall.dylib */ = {
+       D3A763FE09BEB271002E9B53 /* All */ = {
                activeExec = 0;
        };
-       D3C7A7EC09BF58D2009127A4 /* apr-1.2.2 */ = {
+       D3A7640609BEB286002E9B53 /* libteletone.dylib */ = {
                activeExec = 0;
        };
-       D3C7A80209BF5B43009127A4 /* sqlite-3.2.8 */ = {
+       D3A7642E09BEB480002E9B53 /* libsqlite3.dylib */ = {
                activeExec = 0;
        };
-       D3C7A84009BF5FC2009127A4 /* apr-util-1.2.2 */ = {
-               activeExec = 0;
+       D3A7662C09BEB5EA002E9B53 /* build.c */ = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {1332, 41146}}";
+                       sepNavSelRange = "{0, 0}";
+                       sepNavVisRect = "{{0, 0}, {1332, 762}}";
+                       sepNavWindowFrame = "{{61, 90}, {1371, 891}}";
+               };
        };
-       D3C7A85C09BF6066009127A4 /* resample-0.1.3 */ = {
-               activeExec = 0;
+       D3A7665409BEB5EA002E9B53 /* tokenize.c */ = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {1332, 6076}}";
+                       sepNavSelRange = "{9603, 37}";
+                       sepNavVisRect = "{{0, 4652}, {1332, 762}}";
+                       sepNavWindowFrame = "{{107, 48}, {1371, 891}}";
+               };
        };
-       D3C7A86109BF60A1009127A4 /* teletone */ = {
+       D3A7673709BEBAFE002E9B53 /* build.c:29 */ = {
+               isa = PBXFileBreakpoint;
+               actions = (
+               );
+               continueAfterActions = 0;
+               delayBeforeContinue = 0;
+               fileReference = D3A7662C09BEB5EA002E9B53 /* build.c */;
+               hitCount = 0;
+               lineNumber = 29;
+               modificationTime = 163494654.595558;
+               state = 1;
+       };
+       D3A7676B09BEBCF7002E9B53 /* libsqlite3.a */ = {
                activeExec = 0;
        };
 }
index ad8d14cb77be30f5d6632da818bd7a0c3665db25..0442930128662079cb4c95cba0681f0c8b8d4239 100644 (file)
                                PRODUCT_NAME = All;
                        };
                        dependencies = (
-                               D3C7A83E09BF5F94009127A4 /* PBXTargetDependency */,
-                               D3C7A85109BF6039009127A4 /* PBXTargetDependency */,
-                               D3C7A84F09BF602F009127A4 /* PBXTargetDependency */,
-                               D3C7A85F09BF6098009127A4 /* PBXTargetDependency */,
-                               D3C7A87409BF60F2009127A4 /* PBXTargetDependency */,
+                               D3A7640909BEB296002E9B53 /* PBXTargetDependency */,
+                               D3A7640009BEB27C002E9B53 /* PBXTargetDependency */,
+                               D3A7640209BEB27E002E9B53 /* PBXTargetDependency */,
+                               D3A767BA09BEBD8B002E9B53 /* PBXTargetDependency */,
+                               D3A767BC09BEBD8D002E9B53 /* PBXTargetDependency */,
+                               D31D4E6F09BEC40B001112B8 /* PBXTargetDependency */,
+                               D31D4E7109BEC40D001112B8 /* PBXTargetDependency */,
+                               D31D500909BEC88B001112B8 /* PBXTargetDependency */,
+                               D31D500B09BEC88E001112B8 /* PBXTargetDependency */,
                                D31D508B09BECB94001112B8 /* PBXTargetDependency */,
                                D31D50B109BECE4C001112B8 /* PBXTargetDependency */,
-<<<<<<< .mine
-                               D30F712109BF743D00A494C4 /* PBXTargetDependency */,
-=======
-                               D3C7A71509BF418C009127A4 /* PBXTargetDependency */,
-                               D3C7A73909BF47A5009127A4 /* PBXTargetDependency */,
->>>>>>> .r812
                        );
                        name = All;
                        productName = All;
                };
-               D3C7A7EC09BF58D2009127A4 /* apr-1.2.2 */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = D3C7A7F809BF58E5009127A4 /* Build configuration list for PBXAggregateTarget "apr-1.2.2" */;
-                       buildPhases = (
-                               D3C7A7EB09BF58D2009127A4 /* ShellScript */,
-                       );
-                       buildSettings = {
-                               PRODUCT_NAME = apr;
-                       };
-                       dependencies = (
-                       );
-                       name = "apr-1.2.2";
-                       productName = apr;
-               };
-               D3C7A80209BF5B43009127A4 /* sqlite-3.2.8 */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = D3C7A80809BF5B98009127A4 /* Build configuration list for PBXAggregateTarget "sqlite-3.2.8" */;
-                       buildPhases = (
-                               D3C7A80109BF5B43009127A4 /* ShellScript */,
-                       );
-                       buildSettings = {
-                               PRODUCT_NAME = "sqlite-3.2.8";
-                       };
-                       dependencies = (
-                       );
-                       name = "sqlite-3.2.8";
-                       productName = "sqlite-3.2.8";
-               };
-               D3C7A84009BF5FC2009127A4 /* apr-util-1.2.2 */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = D3C7A84B09BF5FF9009127A4 /* Build configuration list for PBXAggregateTarget "apr-util-1.2.2" */;
-                       buildPhases = (
-                               D3C7A83F09BF5FC2009127A4 /* ShellScript */,
-                       );
-                       buildSettings = {
-                               PRODUCT_NAME = "apr-utile-1.2.2";
-                       };
-                       dependencies = (
-                       );
-                       name = "apr-util-1.2.2";
-                       productName = "apr-utile-1.2.2";
-               };
-               D3C7A85C09BF6066009127A4 /* resample-0.1.3 */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = D3C7A86C09BF60A5009127A4 /* Build configuration list for PBXAggregateTarget "resample-0.1.3" */;
-                       buildPhases = (
-                               D3C7A85B09BF6066009127A4 /* ShellScript */,
-                       );
-                       buildSettings = {
-                               PRODUCT_NAME = "resample-0.1.3";
-                       };
-                       dependencies = (
-                       );
-                       name = "resample-0.1.3";
-                       productName = "resample-0.1.3";
-               };
-               D3C7A86109BF60A1009127A4 /* teletone */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = D3C7A86F09BF60A5009127A4 /* Build configuration list for PBXAggregateTarget "teletone" */;
-                       buildPhases = (
-                               D3C7A86009BF60A1009127A4 /* ShellScript */,
-                       );
-                       buildSettings = {
-                               PRODUCT_NAME = teletone;
-                       };
-                       dependencies = (
-                       );
-                       name = teletone;
-                       productName = teletone;
-               };
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-<<<<<<< .mine
-               D30F70E709BF6EFF00A494C4 /* mod_echo.c in Sources */ = {isa = PBXBuildFile; fileRef = D30F70E609BF6EFF00A494C4 /* mod_echo.c */; };
-               D30F70E909BF6F2000A494C4 /* libfreeswitch.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D504209BECA92001112B8 /* libfreeswitch.dylib */; };
-               D30F70EC09BF6F2D00A494C4 /* libapr.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D4A4B09BEBF01001112B8 /* libapr.dylib */; };
-               D30F70ED09BF6F2D00A494C4 /* libapr-util.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D4E7A09BEC533001112B8 /* libapr-util.dylib */; };
-               D30F70F009BF6F3900A494C4 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A7642F09BEB480002E9B53 /* libsqlite3.dylib */; };
                D31D4C2C09BEC1BE001112B8 /* apr.h in Headers */ = {isa = PBXBuildFile; fileRef = D31D4BB609BEC163001112B8 /* apr.h */; };
                D31D4C2D09BEC1BE001112B8 /* apr_allocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D31D4BBA09BEC163001112B8 /* apr_allocator.h */; };
                D31D4C2E09BEC1BE001112B8 /* apr_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = D31D4BBB09BEC163001112B8 /* apr_atomic.h */; };
                D31D500309BEC87B001112B8 /* apr_strmatch.c in Sources */ = {isa = PBXBuildFile; fileRef = D31D4EC009BEC643001112B8 /* apr_strmatch.c */; };
                D31D500409BEC87B001112B8 /* apr_uri.c in Sources */ = {isa = PBXBuildFile; fileRef = D31D4EE109BEC644001112B8 /* apr_uri.c */; };
                D31D500609BEC87B001112B8 /* xlate.c in Sources */ = {isa = PBXBuildFile; fileRef = D31D4EE609BEC644001112B8 /* xlate.c */; };
-=======
->>>>>>> .r812
                D31D505E09BECAF7001112B8 /* switch_buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = D31D503009BECA2B001112B8 /* switch_buffer.c */; };
                D31D505F09BECAF7001112B8 /* switch_caller.c in Sources */ = {isa = PBXBuildFile; fileRef = D31D503109BECA2B001112B8 /* switch_caller.c */; };
                D31D506009BECAF7001112B8 /* switch_channel.c in Sources */ = {isa = PBXBuildFile; fileRef = D31D503209BECA2B001112B8 /* switch_channel.c */; };
                D31D507C09BECAFB001112B8 /* switch_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = D31D505B09BECAED001112B8 /* switch_utils.h */; };
                D31D507D09BECAFB001112B8 /* switch_version.h in Headers */ = {isa = PBXBuildFile; fileRef = D31D505C09BECAED001112B8 /* switch_version.h */; };
                D31D507E09BECAFB001112B8 /* switch.h in Headers */ = {isa = PBXBuildFile; fileRef = D31D505D09BECAED001112B8 /* switch.h */; };
+               D31D508109BECB41001112B8 /* libresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A7639309BEAB96002E9B53 /* libresample.a */; };
+               D31D508209BECB44001112B8 /* libteletone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A763F309BEB1CF002E9B53 /* libteletone.a */; };
+               D31D508309BECB49001112B8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A7642F09BEB480002E9B53 /* libsqlite3.dylib */; };
+               D31D508409BECB4F001112B8 /* libapr.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D4A4B09BEBF01001112B8 /* libapr.dylib */; };
+               D31D508509BECB51001112B8 /* libapr-util.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D4E7A09BEC533001112B8 /* libapr-util.dylib */; };
+               D31D508809BECB84001112B8 /* libresample.h in Headers */ = {isa = PBXBuildFile; fileRef = D31D508709BECB84001112B8 /* libresample.h */; };
                D31D509809BECBE3001112B8 /* switch.c in Sources */ = {isa = PBXBuildFile; fileRef = D31D509709BECBE3001112B8 /* switch.c */; };
                D31D509909BECBF4001112B8 /* libfreeswitch.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D504209BECA92001112B8 /* libfreeswitch.dylib */; };
-               D346F17E09BF38F800404918 /* mod_echo.c in Sources */ = {isa = PBXBuildFile; fileRef = D346F17509BF389D00404918 /* mod_echo.c */; };
-               D346F17F09BF38FC00404918 /* libfreeswitch.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D504209BECA92001112B8 /* libfreeswitch.dylib */; };
-               D3C7A72409BF4692009127A4 /* mod_bridgecall.c in Sources */ = {isa = PBXBuildFile; fileRef = D3C7A71E09BF4674009127A4 /* mod_bridgecall.c */; };
-               D3C7A72809BF46A8009127A4 /* libfreeswitch.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D504209BECA92001112B8 /* libfreeswitch.dylib */; };
+               D3A763A809BEAD00002E9B53 /* filterkit.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A763A509BEAD00002E9B53 /* filterkit.c */; };
+               D3A763A909BEAD00002E9B53 /* resample.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A763A609BEAD00002E9B53 /* resample.c */; };
+               D3A763AA09BEAD00002E9B53 /* resamplesubs.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A763A709BEAD00002E9B53 /* resamplesubs.c */; };
+               D3A763AF09BEAD21002E9B53 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763AB09BEAD21002E9B53 /* config.h */; };
+               D3A763B009BEAD21002E9B53 /* configtemplate.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763AC09BEAD21002E9B53 /* configtemplate.h */; };
+               D3A763B109BEAD21002E9B53 /* filterkit.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763AD09BEAD21002E9B53 /* filterkit.h */; };
+               D3A763B209BEAD21002E9B53 /* resample_defs.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763AE09BEAD21002E9B53 /* resample_defs.h */; };
+               D3A763F409BEB1ED002E9B53 /* libteletone_detect.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A763EA09BEB1AC002E9B53 /* libteletone_detect.c */; };
+               D3A763F509BEB1ED002E9B53 /* libteletone_generate.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A763EB09BEB1AC002E9B53 /* libteletone_generate.c */; };
+               D3A763F609BEB1F3002E9B53 /* libteletone_detect.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763EC09BEB1C3002E9B53 /* libteletone_detect.h */; };
+               D3A763F709BEB1F3002E9B53 /* libteletone_generate.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763ED09BEB1C3002E9B53 /* libteletone_generate.h */; };
+               D3A763F809BEB1F3002E9B53 /* libteletone.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763EE09BEB1C3002E9B53 /* libteletone.h */; };
+               D3A7640E09BEB2D7002E9B53 /* libteletone_detect.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763EC09BEB1C3002E9B53 /* libteletone_detect.h */; };
+               D3A7640F09BEB2D7002E9B53 /* libteletone_generate.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763ED09BEB1C3002E9B53 /* libteletone_generate.h */; };
+               D3A7641009BEB2D7002E9B53 /* libteletone.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A763EE09BEB1C3002E9B53 /* libteletone.h */; };
+               D3A7641109BEB2DB002E9B53 /* libteletone_detect.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A763EA09BEB1AC002E9B53 /* libteletone_detect.c */; };
+               D3A7641209BEB2DB002E9B53 /* libteletone_generate.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A763EB09BEB1AC002E9B53 /* libteletone_generate.c */; };
+               D3A7662609BEB5BE002E9B53 /* Tcl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A7643E09BEB59F002E9B53 /* Tcl.framework */; };
+               D3A7666009BEB5EA002E9B53 /* alter.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662709BEB5EA002E9B53 /* alter.c */; };
+               D3A7666109BEB5EA002E9B53 /* analyze.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662809BEB5EA002E9B53 /* analyze.c */; };
+               D3A7666209BEB5EA002E9B53 /* attach.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662909BEB5EA002E9B53 /* attach.c */; };
+               D3A7666309BEB5EA002E9B53 /* auth.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662A09BEB5EA002E9B53 /* auth.c */; };
+               D3A7666409BEB5EA002E9B53 /* btree.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662B09BEB5EA002E9B53 /* btree.c */; };
+               D3A7666509BEB5EA002E9B53 /* build.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662C09BEB5EA002E9B53 /* build.c */; };
+               D3A7666609BEB5EA002E9B53 /* callback.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662D09BEB5EA002E9B53 /* callback.c */; };
+               D3A7666709BEB5EA002E9B53 /* complete.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662E09BEB5EA002E9B53 /* complete.c */; };
+               D3A7666909BEB5EA002E9B53 /* date.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663009BEB5EA002E9B53 /* date.c */; };
+               D3A7666A09BEB5EA002E9B53 /* delete.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663109BEB5EA002E9B53 /* delete.c */; };
+               D3A7666C09BEB5EA002E9B53 /* experimental.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663309BEB5EA002E9B53 /* experimental.c */; };
+               D3A7666D09BEB5EA002E9B53 /* expr.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663409BEB5EA002E9B53 /* expr.c */; };
+               D3A7666E09BEB5EA002E9B53 /* func.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663509BEB5EA002E9B53 /* func.c */; };
+               D3A7666F09BEB5EA002E9B53 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663609BEB5EA002E9B53 /* hash.c */; };
+               D3A7667009BEB5EA002E9B53 /* insert.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663709BEB5EA002E9B53 /* insert.c */; };
+               D3A7667109BEB5EA002E9B53 /* legacy.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663809BEB5EA002E9B53 /* legacy.c */; };
+               D3A7667509BEB5EA002E9B53 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663C09BEB5EA002E9B53 /* main.c */; };
+               D3A7667609BEB5EA002E9B53 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663D09BEB5EA002E9B53 /* md5.c */; };
+               D3A7667809BEB5EA002E9B53 /* os_test.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663F09BEB5EA002E9B53 /* os_test.c */; };
+               D3A7667909BEB5EA002E9B53 /* os_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664009BEB5EA002E9B53 /* os_unix.c */; };
+               D3A7667A09BEB5EA002E9B53 /* os_win.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664109BEB5EA002E9B53 /* os_win.c */; };
+               D3A7667B09BEB5EA002E9B53 /* pager.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664209BEB5EA002E9B53 /* pager.c */; };
+               D3A7667C09BEB5EA002E9B53 /* parse.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664309BEB5EA002E9B53 /* parse.c */; };
+               D3A7667D09BEB5EA002E9B53 /* pragma.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664409BEB5EA002E9B53 /* pragma.c */; };
+               D3A7667E09BEB5EA002E9B53 /* prepare.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664509BEB5EA002E9B53 /* prepare.c */; };
+               D3A7667F09BEB5EA002E9B53 /* printf.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664609BEB5EA002E9B53 /* printf.c */; };
+               D3A7668009BEB5EA002E9B53 /* random.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664709BEB5EA002E9B53 /* random.c */; };
+               D3A7668109BEB5EA002E9B53 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664809BEB5EA002E9B53 /* select.c */; };
+               D3A7668309BEB5EA002E9B53 /* showjournal.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664A09BEB5EA002E9B53 /* showjournal.c */; };
+               D3A7668409BEB5EA002E9B53 /* table.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664B09BEB5EA002E9B53 /* table.c */; };
+               D3A7668509BEB5EA002E9B53 /* tclsqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664C09BEB5EA002E9B53 /* tclsqlite.c */; };
+               D3A7668609BEB5EA002E9B53 /* test1.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664D09BEB5EA002E9B53 /* test1.c */; };
+               D3A7668709BEB5EA002E9B53 /* test2.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664E09BEB5EA002E9B53 /* test2.c */; };
+               D3A7668809BEB5EA002E9B53 /* test3.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664F09BEB5EA002E9B53 /* test3.c */; };
+               D3A7668909BEB5EA002E9B53 /* test4.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665009BEB5EA002E9B53 /* test4.c */; };
+               D3A7668A09BEB5EA002E9B53 /* test5.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665109BEB5EA002E9B53 /* test5.c */; };
+               D3A7668D09BEB5EA002E9B53 /* tokenize.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665409BEB5EA002E9B53 /* tokenize.c */; };
+               D3A7668E09BEB5EA002E9B53 /* trigger.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665509BEB5EA002E9B53 /* trigger.c */; };
+               D3A7668F09BEB5EA002E9B53 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665609BEB5EA002E9B53 /* update.c */; };
+               D3A7669009BEB5EA002E9B53 /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665709BEB5EA002E9B53 /* utf.c */; };
+               D3A7669109BEB5EA002E9B53 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665809BEB5EA002E9B53 /* util.c */; };
+               D3A7669209BEB5EA002E9B53 /* vacuum.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665909BEB5EA002E9B53 /* vacuum.c */; };
+               D3A7669309BEB5EA002E9B53 /* vdbe.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665A09BEB5EA002E9B53 /* vdbe.c */; };
+               D3A7669409BEB5EA002E9B53 /* vdbeapi.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665B09BEB5EA002E9B53 /* vdbeapi.c */; };
+               D3A7669509BEB5EA002E9B53 /* vdbeaux.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665C09BEB5EA002E9B53 /* vdbeaux.c */; };
+               D3A7669609BEB5EA002E9B53 /* vdbefifo.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665D09BEB5EA002E9B53 /* vdbefifo.c */; };
+               D3A7669709BEB5EA002E9B53 /* vdbemem.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665E09BEB5EA002E9B53 /* vdbemem.c */; };
+               D3A7669809BEB5EA002E9B53 /* where.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665F09BEB5EA002E9B53 /* where.c */; };
+               D3A766A709BEB615002E9B53 /* btree.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669909BEB615002E9B53 /* btree.h */; };
+               D3A766A809BEB615002E9B53 /* hash.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669A09BEB615002E9B53 /* hash.h */; };
+               D3A766A909BEB615002E9B53 /* opcodes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669B09BEB615002E9B53 /* opcodes.h */; };
+               D3A766AA09BEB615002E9B53 /* os_common.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669C09BEB615002E9B53 /* os_common.h */; };
+               D3A766AB09BEB615002E9B53 /* os_test.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669D09BEB615002E9B53 /* os_test.h */; };
+               D3A766AC09BEB615002E9B53 /* os_unix.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669E09BEB615002E9B53 /* os_unix.h */; };
+               D3A766AD09BEB615002E9B53 /* os_win.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669F09BEB615002E9B53 /* os_win.h */; };
+               D3A766AE09BEB615002E9B53 /* os.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A009BEB615002E9B53 /* os.h */; };
+               D3A766AF09BEB615002E9B53 /* pager.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A109BEB615002E9B53 /* pager.h */; };
+               D3A766B009BEB615002E9B53 /* parse.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A209BEB615002E9B53 /* parse.h */; };
+               D3A766B109BEB615002E9B53 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A309BEB615002E9B53 /* sqlite3.h */; };
+               D3A766B209BEB615002E9B53 /* sqliteInt.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A409BEB615002E9B53 /* sqliteInt.h */; };
+               D3A766B309BEB615002E9B53 /* vdbe.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A509BEB615002E9B53 /* vdbe.h */; };
+               D3A766B409BEB615002E9B53 /* vdbeInt.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A609BEB615002E9B53 /* vdbeInt.h */; };
+               D3A766D609BEB776002E9B53 /* keywordhash.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766D509BEB776002E9B53 /* keywordhash.h */; };
+               D3A766DB09BEB7CF002E9B53 /* opcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A766DA09BEB7CF002E9B53 /* opcodes.c */; };
+               D3A7676D09BEBD09002E9B53 /* opcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A766DA09BEB7CF002E9B53 /* opcodes.c */; };
+               D3A7676E09BEBD09002E9B53 /* alter.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662709BEB5EA002E9B53 /* alter.c */; };
+               D3A7676F09BEBD09002E9B53 /* analyze.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662809BEB5EA002E9B53 /* analyze.c */; };
+               D3A7677009BEBD09002E9B53 /* attach.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662909BEB5EA002E9B53 /* attach.c */; };
+               D3A7677109BEBD09002E9B53 /* auth.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662A09BEB5EA002E9B53 /* auth.c */; };
+               D3A7677209BEBD09002E9B53 /* btree.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662B09BEB5EA002E9B53 /* btree.c */; };
+               D3A7677309BEBD09002E9B53 /* build.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662C09BEB5EA002E9B53 /* build.c */; };
+               D3A7677409BEBD09002E9B53 /* callback.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662D09BEB5EA002E9B53 /* callback.c */; };
+               D3A7677509BEBD09002E9B53 /* complete.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7662E09BEB5EA002E9B53 /* complete.c */; };
+               D3A7677609BEBD09002E9B53 /* date.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663009BEB5EA002E9B53 /* date.c */; };
+               D3A7677709BEBD09002E9B53 /* delete.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663109BEB5EA002E9B53 /* delete.c */; };
+               D3A7677809BEBD09002E9B53 /* experimental.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663309BEB5EA002E9B53 /* experimental.c */; };
+               D3A7677909BEBD09002E9B53 /* expr.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663409BEB5EA002E9B53 /* expr.c */; };
+               D3A7677A09BEBD09002E9B53 /* func.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663509BEB5EA002E9B53 /* func.c */; };
+               D3A7677B09BEBD09002E9B53 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663609BEB5EA002E9B53 /* hash.c */; };
+               D3A7677C09BEBD09002E9B53 /* insert.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663709BEB5EA002E9B53 /* insert.c */; };
+               D3A7677D09BEBD09002E9B53 /* legacy.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663809BEB5EA002E9B53 /* legacy.c */; };
+               D3A7677E09BEBD09002E9B53 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663C09BEB5EA002E9B53 /* main.c */; };
+               D3A7677F09BEBD09002E9B53 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663D09BEB5EA002E9B53 /* md5.c */; };
+               D3A7678009BEBD09002E9B53 /* os_test.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7663F09BEB5EA002E9B53 /* os_test.c */; };
+               D3A7678109BEBD09002E9B53 /* os_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664009BEB5EA002E9B53 /* os_unix.c */; };
+               D3A7678209BEBD09002E9B53 /* os_win.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664109BEB5EA002E9B53 /* os_win.c */; };
+               D3A7678309BEBD09002E9B53 /* pager.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664209BEB5EA002E9B53 /* pager.c */; };
+               D3A7678409BEBD09002E9B53 /* parse.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664309BEB5EA002E9B53 /* parse.c */; };
+               D3A7678509BEBD09002E9B53 /* pragma.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664409BEB5EA002E9B53 /* pragma.c */; };
+               D3A7678609BEBD09002E9B53 /* prepare.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664509BEB5EA002E9B53 /* prepare.c */; };
+               D3A7678709BEBD09002E9B53 /* printf.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664609BEB5EA002E9B53 /* printf.c */; };
+               D3A7678809BEBD09002E9B53 /* random.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664709BEB5EA002E9B53 /* random.c */; };
+               D3A7678909BEBD09002E9B53 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664809BEB5EA002E9B53 /* select.c */; };
+               D3A7678A09BEBD09002E9B53 /* showjournal.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664A09BEB5EA002E9B53 /* showjournal.c */; };
+               D3A7678B09BEBD09002E9B53 /* table.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664B09BEB5EA002E9B53 /* table.c */; };
+               D3A7678C09BEBD09002E9B53 /* tclsqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664C09BEB5EA002E9B53 /* tclsqlite.c */; };
+               D3A7678D09BEBD09002E9B53 /* test1.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664D09BEB5EA002E9B53 /* test1.c */; };
+               D3A7678E09BEBD09002E9B53 /* test2.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664E09BEB5EA002E9B53 /* test2.c */; };
+               D3A7678F09BEBD09002E9B53 /* test3.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7664F09BEB5EA002E9B53 /* test3.c */; };
+               D3A7679009BEBD09002E9B53 /* test4.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665009BEB5EA002E9B53 /* test4.c */; };
+               D3A7679109BEBD09002E9B53 /* test5.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665109BEB5EA002E9B53 /* test5.c */; };
+               D3A7679209BEBD09002E9B53 /* tokenize.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665409BEB5EA002E9B53 /* tokenize.c */; };
+               D3A7679309BEBD09002E9B53 /* trigger.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665509BEB5EA002E9B53 /* trigger.c */; };
+               D3A7679409BEBD09002E9B53 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665609BEB5EA002E9B53 /* update.c */; };
+               D3A7679509BEBD09002E9B53 /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665709BEB5EA002E9B53 /* utf.c */; };
+               D3A7679609BEBD09002E9B53 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665809BEB5EA002E9B53 /* util.c */; };
+               D3A7679709BEBD09002E9B53 /* vacuum.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665909BEB5EA002E9B53 /* vacuum.c */; };
+               D3A7679809BEBD09002E9B53 /* vdbe.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665A09BEB5EA002E9B53 /* vdbe.c */; };
+               D3A7679909BEBD09002E9B53 /* vdbeapi.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665B09BEB5EA002E9B53 /* vdbeapi.c */; };
+               D3A7679A09BEBD09002E9B53 /* vdbeaux.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665C09BEB5EA002E9B53 /* vdbeaux.c */; };
+               D3A7679B09BEBD09002E9B53 /* vdbefifo.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665D09BEB5EA002E9B53 /* vdbefifo.c */; };
+               D3A7679C09BEBD09002E9B53 /* vdbemem.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665E09BEB5EA002E9B53 /* vdbemem.c */; };
+               D3A7679D09BEBD09002E9B53 /* where.c in Sources */ = {isa = PBXBuildFile; fileRef = D3A7665F09BEB5EA002E9B53 /* where.c */; };
+               D3A7679E09BEBD12002E9B53 /* btree.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669909BEB615002E9B53 /* btree.h */; };
+               D3A7679F09BEBD12002E9B53 /* hash.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669A09BEB615002E9B53 /* hash.h */; };
+               D3A767A009BEBD12002E9B53 /* opcodes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669B09BEB615002E9B53 /* opcodes.h */; };
+               D3A767A109BEBD12002E9B53 /* os_common.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669C09BEB615002E9B53 /* os_common.h */; };
+               D3A767A209BEBD12002E9B53 /* os_test.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669D09BEB615002E9B53 /* os_test.h */; };
+               D3A767A309BEBD12002E9B53 /* os_unix.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669E09BEB615002E9B53 /* os_unix.h */; };
+               D3A767A409BEBD12002E9B53 /* os_win.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A7669F09BEB615002E9B53 /* os_win.h */; };
+               D3A767A509BEBD12002E9B53 /* os.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A009BEB615002E9B53 /* os.h */; };
+               D3A767A609BEBD12002E9B53 /* pager.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A109BEB615002E9B53 /* pager.h */; };
+               D3A767A709BEBD12002E9B53 /* parse.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A209BEB615002E9B53 /* parse.h */; };
+               D3A767A809BEBD12002E9B53 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A309BEB615002E9B53 /* sqlite3.h */; };
+               D3A767A909BEBD12002E9B53 /* sqliteInt.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A409BEB615002E9B53 /* sqliteInt.h */; };
+               D3A767AA09BEBD12002E9B53 /* vdbe.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A509BEB615002E9B53 /* vdbe.h */; };
+               D3A767AB09BEBD12002E9B53 /* keywordhash.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766D509BEB776002E9B53 /* keywordhash.h */; };
+               D3A767AC09BEBD12002E9B53 /* vdbeInt.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A766A609BEB615002E9B53 /* vdbeInt.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildStyle section */
 /* End PBXBuildStyle section */
 
 /* Begin PBXContainerItemProxy section */
-<<<<<<< .mine
-               D30F712009BF743D00A494C4 /* PBXContainerItemProxy */ = {
+               D31D4E6E09BEC40B001112B8 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D30F70E109BF6ECA00A494C4 /* mod_echo.dylib */;
-                       remoteInfo = mod_echo.dylib;
+                       remoteGlobalIDString = D31D4A4A09BEBF01001112B8;
+                       remoteInfo = libapr.dylib;
                };
-               D31D4E6E09BEC40B001112B8 /* PBXContainerItemProxy */ = {
-=======
-               D31D508A09BECB94001112B8 /* PBXContainerItemProxy */ = {
->>>>>>> .r812
+               D31D4E7009BEC40D001112B8 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D31D504109BECA92001112B8;
-                       remoteInfo = libfreeswitch.dylib;
+                       remoteGlobalIDString = D31D4DEF09BEC3A1001112B8;
+                       remoteInfo = libapr.a;
                };
-               D31D50B009BECE4C001112B8 /* PBXContainerItemProxy */ = {
+               D31D500809BEC88B001112B8 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D31D508F09BECBA3001112B8;
-                       remoteInfo = freeswitch;
+                       remoteGlobalIDString = D31D4E7909BEC533001112B8;
+                       remoteInfo = "libapr-util.dylib";
                };
-               D3C7A71409BF418C009127A4 /* PBXContainerItemProxy */ = {
+               D31D500A09BEC88E001112B8 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D346F17909BF38AE00404918 /* mod_echo.dylib */;
-                       remoteInfo = mod_echo.dylib;
+                       remoteGlobalIDString = D31D4FB509BEC85A001112B8;
+                       remoteInfo = "libapr-util.a";
                };
-               D3C7A73809BF47A5009127A4 /* PBXContainerItemProxy */ = {
+               D31D508A09BECB94001112B8 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D3C7A72209BF467F009127A4 /* mod_bridgecall.dylib */;
-                       remoteInfo = mod_bridgecall.dylib;
+                       remoteGlobalIDString = D31D504109BECA92001112B8;
+                       remoteInfo = libfreeswitch.dylib;
                };
-               D3C7A83D09BF5F94009127A4 /* PBXContainerItemProxy */ = {
+               D31D50B009BECE4C001112B8 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D3C7A80209BF5B43009127A4 /* sqlite-3.2.8 */;
-                       remoteInfo = "sqlite-3.2.8";
+                       remoteGlobalIDString = D31D508F09BECBA3001112B8;
+                       remoteInfo = freeswitch;
                };
-               D3C7A84E09BF602F009127A4 /* PBXContainerItemProxy */ = {
+               D3A763FF09BEB27C002E9B53 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D3C7A84009BF5FC2009127A4 /* apr-util-1.2.2 */;
-                       remoteInfo = "apr-util-1.2.2";
+                       remoteGlobalIDString = D3A763F209BEB1CF002E9B53;
+                       remoteInfo = libteletone.a;
                };
-               D3C7A85009BF6039009127A4 /* PBXContainerItemProxy */ = {
+               D3A7640109BEB27E002E9B53 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D3C7A7EC09BF58D2009127A4 /* apr-1.2.2 */;
-                       remoteInfo = "apr-1.2.2";
+                       remoteGlobalIDString = D3A7639209BEAB96002E9B53;
+                       remoteInfo = libresample.a;
                };
-               D3C7A85E09BF6098009127A4 /* PBXContainerItemProxy */ = {
+               D3A7640809BEB296002E9B53 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D3C7A85C09BF6066009127A4 /* resample-0.1.3 */;
-                       remoteInfo = "resample-0.1.3";
+                       remoteGlobalIDString = D3A7640609BEB286002E9B53;
+                       remoteInfo = libteletone.dylib;
                };
-               D3C7A87309BF60F2009127A4 /* PBXContainerItemProxy */ = {
+               D3A767B909BEBD8B002E9B53 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D3C7A86109BF60A1009127A4 /* teletone */;
-                       remoteInfo = teletone;
+                       remoteGlobalIDString = D3A7642E09BEB480002E9B53;
+                       remoteInfo = libsqlite3.dylib;
                };
-               D3C7A95809BF6A15009127A4 /* PBXContainerItemProxy */ = {
+               D3A767BB09BEBD8D002E9B53 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = D31D504109BECA92001112B8 /* libfreeswitch.dylib */;
-                       remoteInfo = libfreeswitch.dylib;
+                       remoteGlobalIDString = D3A7676B09BEBCF7002E9B53;
+                       remoteInfo = libsqlite3.a;
                };
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-<<<<<<< .mine
-               D30F70E209BF6ECA00A494C4 /* mod_echo.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = mod_echo.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-               D30F70E609BF6EFF00A494C4 /* mod_echo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_echo.c; path = src/mod/applications/mod_echo/mod_echo.c; sourceTree = "<group>"; };
                D31D4A4B09BEBF01001112B8 /* libapr.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libapr.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                D31D4A6C09BEC0D8001112B8 /* dso.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = dso.c; sourceTree = "<group>"; };
                D31D4AB609BEC0D8001112B8 /* global_mutex.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = global_mutex.c; sourceTree = "<group>"; };
                D31D4F3B09BEC69C001112B8 /* apu_config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = apu_config.h; sourceTree = "<group>"; };
                D31D4F3E09BEC69C001112B8 /* apu_select_dbm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = apu_select_dbm.h; sourceTree = "<group>"; };
                D31D4FB609BEC85A001112B8 /* libapr-util.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libapr-util.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-=======
->>>>>>> .r812
                D31D503009BECA2B001112B8 /* switch_buffer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = switch_buffer.c; path = src/switch_buffer.c; sourceTree = "<group>"; };
                D31D503109BECA2B001112B8 /* switch_caller.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = switch_caller.c; path = src/switch_caller.c; sourceTree = "<group>"; };
                D31D503209BECA2B001112B8 /* switch_channel.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = switch_channel.c; path = src/switch_channel.c; sourceTree = "<group>"; };
                D31D505B09BECAED001112B8 /* switch_utils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = switch_utils.h; path = src/include/switch_utils.h; sourceTree = "<group>"; };
                D31D505C09BECAED001112B8 /* switch_version.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = switch_version.h; path = src/include/switch_version.h; sourceTree = "<group>"; };
                D31D505D09BECAED001112B8 /* switch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = switch.h; path = src/include/switch.h; sourceTree = "<group>"; };
+               D31D508709BECB84001112B8 /* libresample.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = libresample.h; path = "libs/libresample-0.1.3/include/libresample.h"; sourceTree = "<group>"; };
                D31D509009BECBA3001112B8 /* freeswitch */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = freeswitch; sourceTree = BUILT_PRODUCTS_DIR; };
                D31D509709BECBE3001112B8 /* switch.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = switch.c; path = src/switch.c; sourceTree = "<group>"; };
-               D346F17509BF389D00404918 /* mod_echo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_echo.c; path = src/mod/applications/mod_echo/mod_echo.c; sourceTree = "<group>"; };
-               D346F17A09BF38AE00404918 /* mod_echo.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = mod_echo.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+               D3A7639309BEAB96002E9B53 /* libresample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libresample.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               D3A763A509BEAD00002E9B53 /* filterkit.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = filterkit.c; path = "libs/libresample-0.1.3/src/filterkit.c"; sourceTree = "<group>"; };
+               D3A763A609BEAD00002E9B53 /* resample.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = resample.c; path = "libs/libresample-0.1.3/src/resample.c"; sourceTree = "<group>"; };
+               D3A763A709BEAD00002E9B53 /* resamplesubs.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = resamplesubs.c; path = "libs/libresample-0.1.3/src/resamplesubs.c"; sourceTree = "<group>"; };
+               D3A763AB09BEAD21002E9B53 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "libs/libresample-0.1.3/src/config.h"; sourceTree = "<group>"; };
+               D3A763AC09BEAD21002E9B53 /* configtemplate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = configtemplate.h; path = "libs/libresample-0.1.3/src/configtemplate.h"; sourceTree = "<group>"; };
+               D3A763AD09BEAD21002E9B53 /* filterkit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = filterkit.h; path = "libs/libresample-0.1.3/src/filterkit.h"; sourceTree = "<group>"; };
+               D3A763AE09BEAD21002E9B53 /* resample_defs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = resample_defs.h; path = "libs/libresample-0.1.3/src/resample_defs.h"; sourceTree = "<group>"; };
+               D3A763EA09BEB1AC002E9B53 /* libteletone_detect.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = libteletone_detect.c; path = libs/libteletone/src/libteletone_detect.c; sourceTree = "<group>"; };
+               D3A763EB09BEB1AC002E9B53 /* libteletone_generate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = libteletone_generate.c; path = libs/libteletone/src/libteletone_generate.c; sourceTree = "<group>"; };
+               D3A763EC09BEB1C3002E9B53 /* libteletone_detect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = libteletone_detect.h; path = libs/libteletone/src/libteletone_detect.h; sourceTree = "<group>"; };
+               D3A763ED09BEB1C3002E9B53 /* libteletone_generate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = libteletone_generate.h; path = libs/libteletone/src/libteletone_generate.h; sourceTree = "<group>"; };
+               D3A763EE09BEB1C3002E9B53 /* libteletone.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = libteletone.h; path = libs/libteletone/src/libteletone.h; sourceTree = "<group>"; };
+               D3A763F309BEB1CF002E9B53 /* libteletone.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libteletone.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               D3A7640709BEB286002E9B53 /* libteletone.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libteletone.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+               D3A7642F09BEB480002E9B53 /* libsqlite3.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsqlite3.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                D3A7643E09BEB59F002E9B53 /* Tcl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Tcl.framework; path = /System/Library/Frameworks/Tcl.framework; sourceTree = "<absolute>"; };
-               D3C7A71E09BF4674009127A4 /* mod_bridgecall.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_bridgecall.c; path = src/mod/applications/mod_bridgecall/mod_bridgecall.c; sourceTree = "<group>"; };
-               D3C7A72309BF467F009127A4 /* mod_bridgecall.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = mod_bridgecall.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+               D3A7662709BEB5EA002E9B53 /* alter.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = alter.c; path = "libs/sqlite-3.2.8/src/alter.c"; sourceTree = "<group>"; };
+               D3A7662809BEB5EA002E9B53 /* analyze.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = analyze.c; path = "libs/sqlite-3.2.8/src/analyze.c"; sourceTree = "<group>"; };
+               D3A7662909BEB5EA002E9B53 /* attach.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = attach.c; path = "libs/sqlite-3.2.8/src/attach.c"; sourceTree = "<group>"; };
+               D3A7662A09BEB5EA002E9B53 /* auth.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = auth.c; path = "libs/sqlite-3.2.8/src/auth.c"; sourceTree = "<group>"; };
+               D3A7662B09BEB5EA002E9B53 /* btree.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = btree.c; path = "libs/sqlite-3.2.8/src/btree.c"; sourceTree = "<group>"; };
+               D3A7662C09BEB5EA002E9B53 /* build.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = build.c; path = "libs/sqlite-3.2.8/src/build.c"; sourceTree = "<group>"; };
+               D3A7662D09BEB5EA002E9B53 /* callback.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = callback.c; path = "libs/sqlite-3.2.8/src/callback.c"; sourceTree = "<group>"; };
+               D3A7662E09BEB5EA002E9B53 /* complete.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = complete.c; path = "libs/sqlite-3.2.8/src/complete.c"; sourceTree = "<group>"; };
+               D3A7663009BEB5EA002E9B53 /* date.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = date.c; path = "libs/sqlite-3.2.8/src/date.c"; sourceTree = "<group>"; };
+               D3A7663109BEB5EA002E9B53 /* delete.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = delete.c; path = "libs/sqlite-3.2.8/src/delete.c"; sourceTree = "<group>"; };
+               D3A7663309BEB5EA002E9B53 /* experimental.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = experimental.c; path = "libs/sqlite-3.2.8/src/experimental.c"; sourceTree = "<group>"; };
+               D3A7663409BEB5EA002E9B53 /* expr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = expr.c; path = "libs/sqlite-3.2.8/src/expr.c"; sourceTree = "<group>"; };
+               D3A7663509BEB5EA002E9B53 /* func.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = func.c; path = "libs/sqlite-3.2.8/src/func.c"; sourceTree = "<group>"; };
+               D3A7663609BEB5EA002E9B53 /* hash.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hash.c; path = "libs/sqlite-3.2.8/src/hash.c"; sourceTree = "<group>"; };
+               D3A7663709BEB5EA002E9B53 /* insert.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = insert.c; path = "libs/sqlite-3.2.8/src/insert.c"; sourceTree = "<group>"; };
+               D3A7663809BEB5EA002E9B53 /* legacy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = legacy.c; path = "libs/sqlite-3.2.8/src/legacy.c"; sourceTree = "<group>"; };
+               D3A7663C09BEB5EA002E9B53 /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = main.c; path = "libs/sqlite-3.2.8/src/main.c"; sourceTree = "<group>"; };
+               D3A7663D09BEB5EA002E9B53 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = md5.c; path = "libs/sqlite-3.2.8/src/md5.c"; sourceTree = "<group>"; };
+               D3A7663F09BEB5EA002E9B53 /* os_test.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = os_test.c; path = "libs/sqlite-3.2.8/src/os_test.c"; sourceTree = "<group>"; };
+               D3A7664009BEB5EA002E9B53 /* os_unix.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = os_unix.c; path = "libs/sqlite-3.2.8/src/os_unix.c"; sourceTree = "<group>"; };
+               D3A7664109BEB5EA002E9B53 /* os_win.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = os_win.c; path = "libs/sqlite-3.2.8/src/os_win.c"; sourceTree = "<group>"; };
+               D3A7664209BEB5EA002E9B53 /* pager.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pager.c; path = "libs/sqlite-3.2.8/src/pager.c"; sourceTree = "<group>"; };
+               D3A7664309BEB5EA002E9B53 /* parse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = parse.c; path = "libs/sqlite-3.2.8/parse.c"; sourceTree = "<group>"; };
+               D3A7664409BEB5EA002E9B53 /* pragma.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pragma.c; path = "libs/sqlite-3.2.8/src/pragma.c"; sourceTree = "<group>"; };
+               D3A7664509BEB5EA002E9B53 /* prepare.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = prepare.c; path = "libs/sqlite-3.2.8/src/prepare.c"; sourceTree = "<group>"; };
+               D3A7664609BEB5EA002E9B53 /* printf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = printf.c; path = "libs/sqlite-3.2.8/src/printf.c"; sourceTree = "<group>"; };
+               D3A7664709BEB5EA002E9B53 /* random.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = random.c; path = "libs/sqlite-3.2.8/src/random.c"; sourceTree = "<group>"; };
+               D3A7664809BEB5EA002E9B53 /* select.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = select.c; path = "libs/sqlite-3.2.8/src/select.c"; sourceTree = "<group>"; };
+               D3A7664A09BEB5EA002E9B53 /* showjournal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = showjournal.c; path = "libs/sqlite-3.2.8/tool/showjournal.c"; sourceTree = "<group>"; };
+               D3A7664B09BEB5EA002E9B53 /* table.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = table.c; path = "libs/sqlite-3.2.8/src/table.c"; sourceTree = "<group>"; };
+               D3A7664C09BEB5EA002E9B53 /* tclsqlite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = tclsqlite.c; path = "libs/sqlite-3.2.8/src/tclsqlite.c"; sourceTree = "<group>"; };
+               D3A7664D09BEB5EA002E9B53 /* test1.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = test1.c; path = "libs/sqlite-3.2.8/src/test1.c"; sourceTree = "<group>"; };
+               D3A7664E09BEB5EA002E9B53 /* test2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = test2.c; path = "libs/sqlite-3.2.8/src/test2.c"; sourceTree = "<group>"; };
+               D3A7664F09BEB5EA002E9B53 /* test3.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = test3.c; path = "libs/sqlite-3.2.8/src/test3.c"; sourceTree = "<group>"; };
+               D3A7665009BEB5EA002E9B53 /* test4.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = test4.c; path = "libs/sqlite-3.2.8/src/test4.c"; sourceTree = "<group>"; };
+               D3A7665109BEB5EA002E9B53 /* test5.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = test5.c; path = "libs/sqlite-3.2.8/src/test5.c"; sourceTree = "<group>"; };
+               D3A7665409BEB5EA002E9B53 /* tokenize.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = tokenize.c; path = "libs/sqlite-3.2.8/src/tokenize.c"; sourceTree = "<group>"; };
+               D3A7665509BEB5EA002E9B53 /* trigger.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = trigger.c; path = "libs/sqlite-3.2.8/src/trigger.c"; sourceTree = "<group>"; };
+               D3A7665609BEB5EA002E9B53 /* update.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = update.c; path = "libs/sqlite-3.2.8/src/update.c"; sourceTree = "<group>"; };
+               D3A7665709BEB5EA002E9B53 /* utf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = utf.c; path = "libs/sqlite-3.2.8/src/utf.c"; sourceTree = "<group>"; };
+               D3A7665809BEB5EA002E9B53 /* util.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = util.c; path = "libs/sqlite-3.2.8/src/util.c"; sourceTree = "<group>"; };
+               D3A7665909BEB5EA002E9B53 /* vacuum.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = vacuum.c; path = "libs/sqlite-3.2.8/src/vacuum.c"; sourceTree = "<group>"; };
+               D3A7665A09BEB5EA002E9B53 /* vdbe.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = vdbe.c; path = "libs/sqlite-3.2.8/src/vdbe.c"; sourceTree = "<group>"; };
+               D3A7665B09BEB5EA002E9B53 /* vdbeapi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = vdbeapi.c; path = "libs/sqlite-3.2.8/src/vdbeapi.c"; sourceTree = "<group>"; };
+               D3A7665C09BEB5EA002E9B53 /* vdbeaux.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = vdbeaux.c; path = "libs/sqlite-3.2.8/src/vdbeaux.c"; sourceTree = "<group>"; };
+               D3A7665D09BEB5EA002E9B53 /* vdbefifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = vdbefifo.c; path = "libs/sqlite-3.2.8/src/vdbefifo.c"; sourceTree = "<group>"; };
+               D3A7665E09BEB5EA002E9B53 /* vdbemem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = vdbemem.c; path = "libs/sqlite-3.2.8/src/vdbemem.c"; sourceTree = "<group>"; };
+               D3A7665F09BEB5EA002E9B53 /* where.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = where.c; path = "libs/sqlite-3.2.8/src/where.c"; sourceTree = "<group>"; };
+               D3A7669909BEB615002E9B53 /* btree.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = btree.h; path = "libs/sqlite-3.2.8/src/btree.h"; sourceTree = "<group>"; };
+               D3A7669A09BEB615002E9B53 /* hash.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hash.h; path = "libs/sqlite-3.2.8/src/hash.h"; sourceTree = "<group>"; };
+               D3A7669B09BEB615002E9B53 /* opcodes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = opcodes.h; path = "libs/sqlite-3.2.8/opcodes.h"; sourceTree = "<group>"; };
+               D3A7669C09BEB615002E9B53 /* os_common.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = os_common.h; path = "libs/sqlite-3.2.8/src/os_common.h"; sourceTree = "<group>"; };
+               D3A7669D09BEB615002E9B53 /* os_test.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = os_test.h; path = "libs/sqlite-3.2.8/src/os_test.h"; sourceTree = "<group>"; };
+               D3A7669E09BEB615002E9B53 /* os_unix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = os_unix.h; path = "libs/sqlite-3.2.8/src/os_unix.h"; sourceTree = "<group>"; };
+               D3A7669F09BEB615002E9B53 /* os_win.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = os_win.h; path = "libs/sqlite-3.2.8/src/os_win.h"; sourceTree = "<group>"; };
+               D3A766A009BEB615002E9B53 /* os.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = os.h; path = "libs/sqlite-3.2.8/src/os.h"; sourceTree = "<group>"; };
+               D3A766A109BEB615002E9B53 /* pager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pager.h; path = "libs/sqlite-3.2.8/src/pager.h"; sourceTree = "<group>"; };
+               D3A766A209BEB615002E9B53 /* parse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = parse.h; path = "libs/sqlite-3.2.8/parse.h"; sourceTree = "<group>"; };
+               D3A766A309BEB615002E9B53 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = "libs/sqlite-3.2.8/sqlite3.h"; sourceTree = "<group>"; };
+               D3A766A409BEB615002E9B53 /* sqliteInt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqliteInt.h; path = "libs/sqlite-3.2.8/src/sqliteInt.h"; sourceTree = "<group>"; };
+               D3A766A509BEB615002E9B53 /* vdbe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vdbe.h; path = "libs/sqlite-3.2.8/src/vdbe.h"; sourceTree = "<group>"; };
+               D3A766A609BEB615002E9B53 /* vdbeInt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vdbeInt.h; path = "libs/sqlite-3.2.8/src/vdbeInt.h"; sourceTree = "<group>"; };
+               D3A766D509BEB776002E9B53 /* keywordhash.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = keywordhash.h; path = "libs/sqlite-3.2.8/keywordhash.h"; sourceTree = "<group>"; };
+               D3A766DA09BEB7CF002E9B53 /* opcodes.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = opcodes.c; path = "libs/sqlite-3.2.8/opcodes.c"; sourceTree = "<group>"; };
+               D3A7676C09BEBCF7002E9B53 /* libsqlite3.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlite3.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-<<<<<<< .mine
-               D30F70E009BF6ECA00A494C4 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               D30F70F009BF6F3900A494C4 /* libsqlite3.dylib in Frameworks */,
-                               D30F70EC09BF6F2D00A494C4 /* libapr.dylib in Frameworks */,
-                               D30F70ED09BF6F2D00A494C4 /* libapr-util.dylib in Frameworks */,
-                               D30F70E909BF6F2000A494C4 /* libfreeswitch.dylib in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                D31D4A4909BEBF01001112B8 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-=======
->>>>>>> .r812
                D31D504009BECA92001112B8 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D31D508109BECB41001112B8 /* libresample.a in Frameworks */,
+                               D31D508209BECB44001112B8 /* libteletone.a in Frameworks */,
+                               D31D508309BECB49001112B8 /* libsqlite3.dylib in Frameworks */,
+                               D31D508409BECB4F001112B8 /* libapr.dylib in Frameworks */,
+                               D31D508509BECB51001112B8 /* libapr-util.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               D346F17809BF38AE00404918 /* Frameworks */ = {
+               D3A7639109BEAB96002E9B53 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               D346F17F09BF38FC00404918 /* libfreeswitch.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               D3C7A72109BF467F009127A4 /* Frameworks */ = {
+               D3A763F109BEB1CF002E9B53 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               D3C7A72809BF46A8009127A4 /* libfreeswitch.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-<<<<<<< .mine
-               D30F70DB09BF6E9D00A494C4 /* freeswitch_modules */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D30F70DC09BF6EA800A494C4 /* applications */,
+               D3A7640509BEB286002E9B53 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
                        );
-                       name = freeswitch_modules;
-                       sourceTree = "<group>";
+                       runOnlyForDeploymentPostprocessing = 0;
                };
-               D30F70DC09BF6EA800A494C4 /* applications */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D30F70DD09BF6EB600A494C4 /* mod_echo */,
+               D3A7642D09BEB480002E9B53 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D3A7662609BEB5BE002E9B53 /* Tcl.framework in Frameworks */,
                        );
-                       name = applications;
-                       sourceTree = "<group>";
+                       runOnlyForDeploymentPostprocessing = 0;
                };
-               D30F70DD09BF6EB600A494C4 /* mod_echo */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D30F70E609BF6EFF00A494C4 /* mod_echo.c */,
+               D3A7676A09BEBCF7002E9B53 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
                        );
-                       name = mod_echo;
-                       sourceTree = "<group>";
+                       runOnlyForDeploymentPostprocessing = 0;
                };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
                D31D4A4609BEBE61001112B8 /* apr-1.2.2 */ = {
                        isa = PBXGroup;
                        children = (
                        path = "libs/apr-util-1.2.2/include/private";
                        sourceTree = "<group>";
                };
-=======
->>>>>>> .r812
                D31D502C09BEC9CC001112B8 /* core_freeswitch */ = {
                        isa = PBXGroup;
                        children = (
                        name = freeswitch;
                        sourceTree = "<group>";
                };
-               D346F17209BF382D00404918 /* freswitch_modules */ = {
+               D3A7637E09BEAAEE002E9B53 = {
                        isa = PBXGroup;
                        children = (
-<<<<<<< .mine
-                               D30F70DB09BF6E9D00A494C4 /* freeswitch_modules */,
                                D31D509309BECBCA001112B8 /* freeswitch */,
                                D3A7638B09BEAB0A002E9B53 /* core_dependencies */,
                                D31D502C09BEC9CC001112B8 /* core_freeswitch */,
                                D3A7653209BEB5A3002E9B53 /* existing_frameworks */,
                                D3A7639409BEAB96002E9B53 /* products */,
-=======
-                               D346F17309BF384800404918 /* applications */,
->>>>>>> .r812
                        );
-                       name = freswitch_modules;
                        sourceTree = "<group>";
                };
-               D346F17309BF384800404918 /* applications */ = {
+               D3A7638B09BEAB0A002E9B53 /* core_dependencies */ = {
                        isa = PBXGroup;
                        children = (
-                               D3C7A71D09BF464A009127A4 /* mod_bridgecall */,
-                               D346F17409BF387400404918 /* mod_echo */,
+                               D31D4A4609BEBE61001112B8 /* apr-1.2.2 */,
+                               D31D4E7509BEC4BE001112B8 /* apr-util-1.2.2 */,
+                               D3A7638C09BEAB1F002E9B53 /* resample */,
+                               D3A763E209BEB15E002E9B53 /* teletone */,
+                               D3A7643A09BEB500002E9B53 /* sqlite-3.2.8 */,
                        );
-                       name = applications;
+                       name = core_dependencies;
                        sourceTree = "<group>";
                };
-               D346F17409BF387400404918 /* mod_echo */ = {
+               D3A7638C09BEAB1F002E9B53 /* resample */ = {
                        isa = PBXGroup;
                        children = (
-                               D346F17509BF389D00404918 /* mod_echo.c */,
+                               D3A7638E09BEAB2A002E9B53 /* include */,
+                               D3A7638D09BEAB26002E9B53 /* src */,
                        );
-                       name = mod_echo;
+                       name = resample;
                        sourceTree = "<group>";
                };
-               D3A7637E09BEAAEE002E9B53 = {
+               D3A7638D09BEAB26002E9B53 /* src */ = {
                        isa = PBXGroup;
                        children = (
-                               D346F17209BF382D00404918 /* freswitch_modules */,
-                               D31D509309BECBCA001112B8 /* freeswitch */,
-                               D31D502C09BEC9CC001112B8 /* core_freeswitch */,
-                               D3A7653209BEB5A3002E9B53 /* existing_frameworks */,
-                               D3A7639409BEAB96002E9B53 /* products */,
+                               D3A763A509BEAD00002E9B53 /* filterkit.c */,
+                               D3A763A609BEAD00002E9B53 /* resample.c */,
+                               D3A763A709BEAD00002E9B53 /* resamplesubs.c */,
+                       );
+                       name = src;
+                       sourceTree = "<group>";
+               };
+               D3A7638E09BEAB2A002E9B53 /* include */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D31D508709BECB84001112B8 /* libresample.h */,
+                               D3A763AB09BEAD21002E9B53 /* config.h */,
+                               D3A763AC09BEAD21002E9B53 /* configtemplate.h */,
+                               D3A763AD09BEAD21002E9B53 /* filterkit.h */,
+                               D3A763AE09BEAD21002E9B53 /* resample_defs.h */,
                        );
+                       name = include;
                        sourceTree = "<group>";
                };
                D3A7639409BEAB96002E9B53 /* products */ = {
                        isa = PBXGroup;
                        children = (
+                               D3A7639309BEAB96002E9B53 /* libresample.a */,
+                               D3A763F309BEB1CF002E9B53 /* libteletone.a */,
+                               D3A7640709BEB286002E9B53 /* libteletone.dylib */,
+                               D3A7642F09BEB480002E9B53 /* libsqlite3.dylib */,
+                               D3A7676C09BEBCF7002E9B53 /* libsqlite3.a */,
+                               D31D4A4B09BEBF01001112B8 /* libapr.dylib */,
+                               D31D4DF009BEC3A1001112B8 /* libapr.a */,
+                               D31D4E7A09BEC533001112B8 /* libapr-util.dylib */,
+                               D31D4FB609BEC85A001112B8 /* libapr-util.a */,
                                D31D504209BECA92001112B8 /* libfreeswitch.dylib */,
                                D31D509009BECBA3001112B8 /* freeswitch */,
-<<<<<<< .mine
-                               D30F70E209BF6ECA00A494C4 /* mod_echo.dylib */,
-=======
-                               D346F17A09BF38AE00404918 /* mod_echo.dylib */,
-                               D3C7A72309BF467F009127A4 /* mod_bridgecall.dylib */,
->>>>>>> .r812
                        );
                        name = products;
                        sourceTree = "<group>";
                };
-               D3A7653209BEB5A3002E9B53 /* existing_frameworks */ = {
+               D3A763E209BEB15E002E9B53 /* teletone */ = {
                        isa = PBXGroup;
                        children = (
-                               D3A7643E09BEB59F002E9B53 /* Tcl.framework */,
+                               D3A763E809BEB17E002E9B53 /* include */,
+                               D3A763E909BEB190002E9B53 /* src */,
                        );
-                       name = existing_frameworks;
+                       name = teletone;
+                       sourceTree = "<group>";
+               };
+               D3A763E809BEB17E002E9B53 /* include */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D3A763EC09BEB1C3002E9B53 /* libteletone_detect.h */,
+                               D3A763ED09BEB1C3002E9B53 /* libteletone_generate.h */,
+                               D3A763EE09BEB1C3002E9B53 /* libteletone.h */,
+                       );
+                       name = include;
+                       sourceTree = "<group>";
+               };
+               D3A763E909BEB190002E9B53 /* src */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D3A763EA09BEB1AC002E9B53 /* libteletone_detect.c */,
+                               D3A763EB09BEB1AC002E9B53 /* libteletone_generate.c */,
+                       );
+                       name = src;
                        sourceTree = "<group>";
                };
-               D3C7A71D09BF464A009127A4 /* mod_bridgecall */ = {
+               D3A7643A09BEB500002E9B53 /* sqlite-3.2.8 */ = {
                        isa = PBXGroup;
                        children = (
-                               D3C7A71E09BF4674009127A4 /* mod_bridgecall.c */,
+                               D3A7643B09BEB511002E9B53 /* include */,
+                               D3A7643C09BEB51E002E9B53 /* src */,
                        );
-                       name = mod_bridgecall;
+                       name = "sqlite-3.2.8";
+                       sourceTree = "<group>";
+               };
+               D3A7643B09BEB511002E9B53 /* include */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D3A7669909BEB615002E9B53 /* btree.h */,
+                               D3A7669A09BEB615002E9B53 /* hash.h */,
+                               D3A7669B09BEB615002E9B53 /* opcodes.h */,
+                               D3A7669C09BEB615002E9B53 /* os_common.h */,
+                               D3A7669D09BEB615002E9B53 /* os_test.h */,
+                               D3A7669E09BEB615002E9B53 /* os_unix.h */,
+                               D3A7669F09BEB615002E9B53 /* os_win.h */,
+                               D3A766A009BEB615002E9B53 /* os.h */,
+                               D3A766A109BEB615002E9B53 /* pager.h */,
+                               D3A766A209BEB615002E9B53 /* parse.h */,
+                               D3A766A309BEB615002E9B53 /* sqlite3.h */,
+                               D3A766A409BEB615002E9B53 /* sqliteInt.h */,
+                               D3A766A509BEB615002E9B53 /* vdbe.h */,
+                               D3A766D509BEB776002E9B53 /* keywordhash.h */,
+                               D3A766A609BEB615002E9B53 /* vdbeInt.h */,
+                       );
+                       name = include;
+                       sourceTree = "<group>";
+               };
+               D3A7643C09BEB51E002E9B53 /* src */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D3A766DA09BEB7CF002E9B53 /* opcodes.c */,
+                               D3A7662709BEB5EA002E9B53 /* alter.c */,
+                               D3A7662809BEB5EA002E9B53 /* analyze.c */,
+                               D3A7662909BEB5EA002E9B53 /* attach.c */,
+                               D3A7662A09BEB5EA002E9B53 /* auth.c */,
+                               D3A7662B09BEB5EA002E9B53 /* btree.c */,
+                               D3A7662C09BEB5EA002E9B53 /* build.c */,
+                               D3A7662D09BEB5EA002E9B53 /* callback.c */,
+                               D3A7662E09BEB5EA002E9B53 /* complete.c */,
+                               D3A7663009BEB5EA002E9B53 /* date.c */,
+                               D3A7663109BEB5EA002E9B53 /* delete.c */,
+                               D3A7663309BEB5EA002E9B53 /* experimental.c */,
+                               D3A7663409BEB5EA002E9B53 /* expr.c */,
+                               D3A7663509BEB5EA002E9B53 /* func.c */,
+                               D3A7663609BEB5EA002E9B53 /* hash.c */,
+                               D3A7663709BEB5EA002E9B53 /* insert.c */,
+                               D3A7663809BEB5EA002E9B53 /* legacy.c */,
+                               D3A7663C09BEB5EA002E9B53 /* main.c */,
+                               D3A7663D09BEB5EA002E9B53 /* md5.c */,
+                               D3A7663F09BEB5EA002E9B53 /* os_test.c */,
+                               D3A7664009BEB5EA002E9B53 /* os_unix.c */,
+                               D3A7664109BEB5EA002E9B53 /* os_win.c */,
+                               D3A7664209BEB5EA002E9B53 /* pager.c */,
+                               D3A7664309BEB5EA002E9B53 /* parse.c */,
+                               D3A7664409BEB5EA002E9B53 /* pragma.c */,
+                               D3A7664509BEB5EA002E9B53 /* prepare.c */,
+                               D3A7664609BEB5EA002E9B53 /* printf.c */,
+                               D3A7664709BEB5EA002E9B53 /* random.c */,
+                               D3A7664809BEB5EA002E9B53 /* select.c */,
+                               D3A7664A09BEB5EA002E9B53 /* showjournal.c */,
+                               D3A7664B09BEB5EA002E9B53 /* table.c */,
+                               D3A7664C09BEB5EA002E9B53 /* tclsqlite.c */,
+                               D3A7664D09BEB5EA002E9B53 /* test1.c */,
+                               D3A7664E09BEB5EA002E9B53 /* test2.c */,
+                               D3A7664F09BEB5EA002E9B53 /* test3.c */,
+                               D3A7665009BEB5EA002E9B53 /* test4.c */,
+                               D3A7665109BEB5EA002E9B53 /* test5.c */,
+                               D3A7665409BEB5EA002E9B53 /* tokenize.c */,
+                               D3A7665509BEB5EA002E9B53 /* trigger.c */,
+                               D3A7665609BEB5EA002E9B53 /* update.c */,
+                               D3A7665709BEB5EA002E9B53 /* utf.c */,
+                               D3A7665809BEB5EA002E9B53 /* util.c */,
+                               D3A7665909BEB5EA002E9B53 /* vacuum.c */,
+                               D3A7665A09BEB5EA002E9B53 /* vdbe.c */,
+                               D3A7665B09BEB5EA002E9B53 /* vdbeapi.c */,
+                               D3A7665C09BEB5EA002E9B53 /* vdbeaux.c */,
+                               D3A7665D09BEB5EA002E9B53 /* vdbefifo.c */,
+                               D3A7665E09BEB5EA002E9B53 /* vdbemem.c */,
+                               D3A7665F09BEB5EA002E9B53 /* where.c */,
+                       );
+                       name = src;
+                       sourceTree = "<group>";
+               };
+               D3A7653209BEB5A3002E9B53 /* existing_frameworks */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D3A7643E09BEB59F002E9B53 /* Tcl.framework */,
+                       );
+                       name = existing_frameworks;
                        sourceTree = "<group>";
                };
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-<<<<<<< .mine
-               D30F70DE09BF6ECA00A494C4 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                D31D4A4709BEBF01001112B8 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-=======
->>>>>>> .r812
                D31D503E09BECA92001112B8 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               D346F17609BF38AE00404918 /* Headers */ = {
+               D3A7638F09BEAB96002E9B53 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D3A763AF09BEAD21002E9B53 /* config.h in Headers */,
+                               D3A763B009BEAD21002E9B53 /* configtemplate.h in Headers */,
+                               D3A763B109BEAD21002E9B53 /* filterkit.h in Headers */,
+                               D3A763B209BEAD21002E9B53 /* resample_defs.h in Headers */,
+                               D31D508809BECB84001112B8 /* libresample.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               D3C7A71F09BF467F009127A4 /* Headers */ = {
+               D3A763EF09BEB1CF002E9B53 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D3A763F609BEB1F3002E9B53 /* libteletone_detect.h in Headers */,
+                               D3A763F709BEB1F3002E9B53 /* libteletone_generate.h in Headers */,
+                               D3A763F809BEB1F3002E9B53 /* libteletone.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-<<<<<<< .mine
-               D30F70E109BF6ECA00A494C4 /* mod_echo.dylib */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = D30F70E309BF6EF200A494C4 /* Build configuration list for PBXNativeTarget "mod_echo.dylib" */;
-                       buildPhases = (
-                               D30F70DE09BF6ECA00A494C4 /* Headers */,
-                               D30F70DF09BF6ECA00A494C4 /* Sources */,
-                               D30F70E009BF6ECA00A494C4 /* Frameworks */,
+               D3A7640309BEB286002E9B53 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D3A7640E09BEB2D7002E9B53 /* libteletone_detect.h in Headers */,
+                               D3A7640F09BEB2D7002E9B53 /* libteletone_generate.h in Headers */,
+                               D3A7641009BEB2D7002E9B53 /* libteletone.h in Headers */,
                        );
-                       buildRules = (
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D3A7642B09BEB480002E9B53 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D3A766A709BEB615002E9B53 /* btree.h in Headers */,
+                               D3A766A809BEB615002E9B53 /* hash.h in Headers */,
+                               D3A766A909BEB615002E9B53 /* opcodes.h in Headers */,
+                               D3A766AA09BEB615002E9B53 /* os_common.h in Headers */,
+                               D3A766AB09BEB615002E9B53 /* os_test.h in Headers */,
+                               D3A766AC09BEB615002E9B53 /* os_unix.h in Headers */,
+                               D3A766AD09BEB615002E9B53 /* os_win.h in Headers */,
+                               D3A766AE09BEB615002E9B53 /* os.h in Headers */,
+                               D3A766AF09BEB615002E9B53 /* pager.h in Headers */,
+                               D3A766B009BEB615002E9B53 /* parse.h in Headers */,
+                               D3A766B109BEB615002E9B53 /* sqlite3.h in Headers */,
+                               D3A766B209BEB615002E9B53 /* sqliteInt.h in Headers */,
+                               D3A766B309BEB615002E9B53 /* vdbe.h in Headers */,
+                               D3A766B409BEB615002E9B53 /* vdbeInt.h in Headers */,
+                               D3A766D609BEB776002E9B53 /* keywordhash.h in Headers */,
                        );
-                       buildSettings = {
-                               EXECUTABLE_PREFIX = lib;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               INSTALL_PATH = /usr/local/lib;
-                               PREBINDING = NO;
-                               PRODUCT_NAME = mod_echo;
-                               ZERO_LINK = YES;
-                       };
-                       dependencies = (
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D3A7676809BEBCF7002E9B53 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D3A7679E09BEBD12002E9B53 /* btree.h in Headers */,
+                               D3A7679F09BEBD12002E9B53 /* hash.h in Headers */,
+                               D3A767A009BEBD12002E9B53 /* opcodes.h in Headers */,
+                               D3A767A109BEBD12002E9B53 /* os_common.h in Headers */,
+                               D3A767A209BEBD12002E9B53 /* os_test.h in Headers */,
+                               D3A767A309BEBD12002E9B53 /* os_unix.h in Headers */,
+                               D3A767A409BEBD12002E9B53 /* os_win.h in Headers */,
+                               D3A767A509BEBD12002E9B53 /* os.h in Headers */,
+                               D3A767A609BEBD12002E9B53 /* pager.h in Headers */,
+                               D3A767A709BEBD12002E9B53 /* parse.h in Headers */,
+                               D3A767A809BEBD12002E9B53 /* sqlite3.h in Headers */,
+                               D3A767A909BEBD12002E9B53 /* sqliteInt.h in Headers */,
+                               D3A767AA09BEBD12002E9B53 /* vdbe.h in Headers */,
+                               D3A767AB09BEBD12002E9B53 /* keywordhash.h in Headers */,
+                               D3A767AC09BEBD12002E9B53 /* vdbeInt.h in Headers */,
                        );
-                       name = mod_echo.dylib;
-                       productName = mod_echo;
-                       productReference = D30F70E209BF6ECA00A494C4 /* mod_echo.dylib */;
-                       productType = "com.apple.product-type.library.dynamic";
+                       runOnlyForDeploymentPostprocessing = 0;
                };
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
                D31D4A4A09BEBF01001112B8 /* libapr.dylib */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = D31D4A4F09BEBF5D001112B8 /* Build configuration list for PBXNativeTarget "libapr.dylib" */;
                        productReference = D31D4FB609BEC85A001112B8 /* libapr-util.a */;
                        productType = "com.apple.product-type.library.static";
                };
-=======
->>>>>>> .r812
                D31D504109BECA92001112B8 /* libfreeswitch.dylib */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = D31D504609BECAAA001112B8 /* Build configuration list for PBXNativeTarget "libfreeswitch.dylib" */;
                        isa = PBXNativeTarget;
                        buildConfigurationList = D31D509409BECBCB001112B8 /* Build configuration list for PBXNativeTarget "freeswitch" */;
                        buildPhases = (
+                               D31D50A009BECC2C001112B8 /* ShellScript */,
                                D31D508D09BECBA3001112B8 /* Sources */,
                                D31D508E09BECBA3001112B8 /* Frameworks */,
                        );
                                ZERO_LINK = YES;
                        };
                        dependencies = (
-                               D3C7A95909BF6A15009127A4 /* PBXTargetDependency */,
                        );
                        name = freeswitch;
                        productName = freeswitch;
                        productReference = D31D509009BECBA3001112B8 /* freeswitch */;
                        productType = "com.apple.product-type.tool";
                };
-               D346F17909BF38AE00404918 /* mod_echo.dylib */ = {
+               D3A7639209BEAB96002E9B53 /* libresample.a */ = {
                        isa = PBXNativeTarget;
-                       buildConfigurationList = D346F17B09BF38BA00404918 /* Build configuration list for PBXNativeTarget "mod_echo.dylib" */;
+                       buildConfigurationList = D3A7639509BEAB97002E9B53 /* Build configuration list for PBXNativeTarget "libresample.a" */;
                        buildPhases = (
-                               D346F17609BF38AE00404918 /* Headers */,
-                               D346F17709BF38AE00404918 /* Sources */,
-                               D346F17809BF38AE00404918 /* Frameworks */,
-                               D346F18709BF393F00404918 /* ShellScript */,
+                               D3A763D409BEB006002E9B53 /* ShellScript */,
+                               D3A7638F09BEAB96002E9B53 /* Headers */,
+                               D3A7639009BEAB96002E9B53 /* Sources */,
+                               D3A7639109BEAB96002E9B53 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       buildSettings = {
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = resample;
+                               ZERO_LINK = YES;
+                       };
+                       dependencies = (
+                       );
+                       name = libresample.a;
+                       productName = resample;
+                       productReference = D3A7639309BEAB96002E9B53 /* libresample.a */;
+                       productType = "com.apple.product-type.library.static";
+               };
+               D3A763F209BEB1CF002E9B53 /* libteletone.a */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D3A763FB09BEB216002E9B53 /* Build configuration list for PBXNativeTarget "libteletone.a" */;
+                       buildPhases = (
+                               D3A763EF09BEB1CF002E9B53 /* Headers */,
+                               D3A763F009BEB1CF002E9B53 /* Sources */,
+                               D3A763F109BEB1CF002E9B53 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       buildSettings = {
+                               EXECUTABLE_PREFIX = lib;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = teletone;
+                               ZERO_LINK = YES;
+                       };
+                       dependencies = (
+                       );
+                       name = libteletone.a;
+                       productName = teletone;
+                       productReference = D3A763F309BEB1CF002E9B53 /* libteletone.a */;
+                       productType = "com.apple.product-type.library.dynamic";
+               };
+               D3A7640609BEB286002E9B53 /* libteletone.dylib */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D3A7641A09BEB306002E9B53 /* Build configuration list for PBXNativeTarget "libteletone.dylib" */;
+                       buildPhases = (
+                               D3A7640309BEB286002E9B53 /* Headers */,
+                               D3A7640409BEB286002E9B53 /* Sources */,
+                               D3A7640509BEB286002E9B53 /* Frameworks */,
                        );
                        buildRules = (
                        );
                                GCC_MODEL_TUNING = G5;
                                INSTALL_PATH = /usr/local/lib;
                                PREBINDING = NO;
-                               PRODUCT_NAME = mod_echo;
+                               PRODUCT_NAME = teletone;
                                ZERO_LINK = YES;
                        };
                        dependencies = (
                        );
-                       name = mod_echo.dylib;
-                       productName = mod_echo;
-                       productReference = D346F17A09BF38AE00404918 /* mod_echo.dylib */;
+                       name = libteletone.dylib;
+                       productName = teletone;
+                       productReference = D3A7640709BEB286002E9B53 /* libteletone.dylib */;
                        productType = "com.apple.product-type.library.dynamic";
                };
-               D3C7A72209BF467F009127A4 /* mod_bridgecall.dylib */ = {
+               D3A7642E09BEB480002E9B53 /* libsqlite3.dylib */ = {
                        isa = PBXNativeTarget;
-                       buildConfigurationList = D3C7A72A09BF46C9009127A4 /* Build configuration list for PBXNativeTarget "mod_bridgecall.dylib" */;
+                       buildConfigurationList = D3A7643509BEB4A7002E9B53 /* Build configuration list for PBXNativeTarget "libsqlite3.dylib" */;
                        buildPhases = (
-                               D3C7A71F09BF467F009127A4 /* Headers */,
-                               D3C7A72009BF467F009127A4 /* Sources */,
-                               D3C7A72109BF467F009127A4 /* Frameworks */,
-                               D3C7A72D09BF46D4009127A4 /* ShellScript */,
+                               D3A7643009BEB495002E9B53 /* ShellScript */,
+                               D3A7642B09BEB480002E9B53 /* Headers */,
+                               D3A7642C09BEB480002E9B53 /* Sources */,
+                               D3A7642D09BEB480002E9B53 /* Frameworks */,
                        );
                        buildRules = (
                        );
                                GCC_MODEL_TUNING = G5;
                                INSTALL_PATH = /usr/local/lib;
                                PREBINDING = NO;
-                               PRODUCT_NAME = mod_bridgecall;
+                               PRODUCT_NAME = sqlite3;
                                ZERO_LINK = YES;
                        };
                        dependencies = (
                        );
-                       name = mod_bridgecall.dylib;
-                       productName = mod_bridgecall;
-                       productReference = D3C7A72309BF467F009127A4 /* mod_bridgecall.dylib */;
+                       name = libsqlite3.dylib;
+                       productName = sqlite3;
+                       productReference = D3A7642F09BEB480002E9B53 /* libsqlite3.dylib */;
                        productType = "com.apple.product-type.library.dynamic";
                };
+               D3A7676B09BEBCF7002E9B53 /* libsqlite3.a */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D3A767B509BEBD34002E9B53 /* Build configuration list for PBXNativeTarget "libsqlite3.a" */;
+                       buildPhases = (
+                               D3A7676809BEBCF7002E9B53 /* Headers */,
+                               D3A7676909BEBCF7002E9B53 /* Sources */,
+                               D3A7676A09BEBCF7002E9B53 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       buildSettings = {
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = sqlite3;
+                               ZERO_LINK = YES;
+                       };
+                       dependencies = (
+                       );
+                       name = libsqlite3.a;
+                       productName = sqlite3;
+                       productReference = D3A7676C09BEBCF7002E9B53 /* libsqlite3.a */;
+                       productType = "com.apple.product-type.library.static";
+               };
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
                        projectDirPath = "";
                        targets = (
                                D3A763FE09BEB271002E9B53 /* All */,
-                               D3C7A7EC09BF58D2009127A4 /* apr-1.2.2 */,
-                               D3C7A80209BF5B43009127A4 /* sqlite-3.2.8 */,
-                               D3C7A84009BF5FC2009127A4 /* apr-util-1.2.2 */,
-                               D3C7A85C09BF6066009127A4 /* resample-0.1.3 */,
-                               D3C7A86109BF60A1009127A4 /* teletone */,
+                               D3A763F209BEB1CF002E9B53 /* libteletone.a */,
+                               D3A7639209BEAB96002E9B53 /* libresample.a */,
+                               D3A7640609BEB286002E9B53 /* libteletone.dylib */,
+                               D3A7642E09BEB480002E9B53 /* libsqlite3.dylib */,
+                               D3A7676B09BEBCF7002E9B53 /* libsqlite3.a */,
+                               D31D4A4A09BEBF01001112B8 /* libapr.dylib */,
+                               D31D4DEF09BEC3A1001112B8 /* libapr.a */,
+                               D31D4E7909BEC533001112B8 /* libapr-util.dylib */,
+                               D31D4FB509BEC85A001112B8 /* libapr-util.a */,
                                D31D504109BECA92001112B8 /* libfreeswitch.dylib */,
                                D31D508F09BECBA3001112B8 /* freeswitch */,
-<<<<<<< .mine
-                               D30F70E109BF6ECA00A494C4 /* mod_echo.dylib */,
-=======
-                               D346F17909BF38AE00404918 /* mod_echo.dylib */,
-                               D3C7A72209BF467F009127A4 /* mod_bridgecall.dylib */,
->>>>>>> .r812
                        );
                };
 /* End PBXProject section */
 
 /* Begin PBXShellScriptBuildPhase section */
-               D31D504309BECAA1001112B8 /* ShellScript */ = {
+               D31D4A4C09BEBF57001112B8 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "if [ -e Makefile ]; then\n\t/bin/cat src/include/switch_version.h.in | /usr/bin/sed \"s/@SVN_VERSION@/`/usr/local/bin/svnversion . -n`/g\" > src/include/switch_version.h\n\texit 0;\nfi\n./configure\n/bin/cat src/include/switch_version.h.in | /usr/bin/sed \"s/@SVN_VERSION@/`/usr/local/bin/svnversion . -n`/g\" > src/include/switch_version.h\nexit 0;\n";
+                       shellScript = "if [ -d \"libs/apr-1.2.2\" ]; then\n\texit 0;\nfi\n\ncurl http://svn.freeswitch.org/downloads/libs/apr-1.2.2.tar.gz -o libs/apr-1.2.2.tar.gz\ncd libs\ntar zxf apr-1.2.2.tar.gz\ncd apr-1.2.2\n./configure\nexit 0;";
                };
-               D346F18709BF393F00404918 /* ShellScript */ = {
+               D31D4E7B09BEC556001112B8 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "/bin/cp -f `/usr/bin/find .xcodebuild -name mod_echo.dylib` .xcodebuild/Debug/mod";
+                       shellScript = "if [ -d \"libs/apr-util-1.2.2\" ]; then\n\texit 0;\nfi\n\ncurl http://svn.freeswitch.org/downloads/libs/apr-util-1.2.2.tar.gz -o libs/apr-util-1.2.2.tar.gz\ncd libs\ntar zxf apr-util-1.2.2.tar.gz\ncd apr-util-1.2.2\n./configure --with-apr=../apr-1.2.2\nexit 0;";
                };
-               D3C7A72D09BF46D4009127A4 /* ShellScript */ = {
+               D31D504309BECAA1001112B8 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-<<<<<<< .mine
-                       shellScript = "if [ -e Makefile ]; then\n\tversion=`/usr/local/bin/svnversion . -n`\n\t/bin/cat src/include/switch_version.h.in | /usr/bin/sed \"s/@SVN_VERSION@/$version/g\" > src/include/switch_version.h\n\techo $version > .version\n\texit 0;\nfi\n./configure\nversion=`/usr/local/bin/svnversion . -n`\n/bin/cat src/include/switch_version.h.in | /usr/bin/sed \"s/@SVN_VERSION@/$version/g\" > src/include/switch_version.h\necho $version > .version\nexit 0;\n";
-=======
-                       shellScript = "/bin/cp -f `/usr/bin/find .xcodebuild -name mod_bridgecall.dylib` .xcodebuild/Debug/mod";
->>>>>>> .r812
+                       shellScript = "if [ -e Makefile ]; then\n\tversion=`/usr/local/bin/svnversion . -n`\n\t/bin/cat src/include/switch_version.h.in | /usr/bin/sed \"s/@SVN_VERSION@/$version/g\" > src/include/\tswitch_version.h\n\techo $version > .version\n\texit 0;\nfi\n./configure\nversion=`/usr/local/bin/svnversion . -n`\n/bin/cat src/include/switch_version.h.in | /usr/bin/sed \"s/@SVN_VERSION@/$version/g\" > src/include/switch_version.h\necho $version > .version\nexit 0;\n";
                };
-               D3C7A7EB09BF58D2009127A4 /* ShellScript */ = {
+               D31D50A009BECC2C001112B8 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-<<<<<<< .mine
-                       shellScript = "";
-=======
-                       shellScript = "./build/buildlib.sh . install apr-1.2.2.tar.gz --prefix=$INSTALL_PATH --disable-tcl --enable-threadsafe";
->>>>>>> .r812
+                       shellScript = "if [ -d \".xcodebuild/Debug/mod\" ]; then\n\texit 0;\nfi\nmkdir .xcodebuild/Debug/{mod,log,conf,db}\ntouch .xcodebuild/Debug/conf/freeswitch.conf\ntouch .xcodebuild/Debug/conf/modules.conf";
                };
-               D3C7A80109BF5B43009127A4 /* ShellScript */ = {
+               D3A763D409BEB006002E9B53 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "./build/buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$INSTALL_PATH --disable-tcl --enable-threadsafe\nexit 0";
+                       shellPath = /bin/bash;
+                       shellScript = "if [ -d \"libs/libresample-0.1.3\" ]; then\n\texit 0;\nfi\n\ncurl http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.tgz -o libs/libresample-0.1.3.tgz\ncd libs\ntar zxf libresample-0.1.3.tgz\ncd libresample-0.1.3\n./configure\nexit 0;\n";
                };
-               D3C7A83F09BF5FC2009127A4 /* ShellScript */ = {
+               D3A7643009BEB495002E9B53 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "./build/buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$INSTALL_PATH\nexit 0";
+                       shellScript = "if [ -d \"libs/sqlite-3.2.8\" ]; then\n\texit 0;\nfi\n\ncurl http://svn.freeswitch.org/downloads/libs/sqlite-3.2.8.tar.gz -o libs/sqlite-3.2.8.tar.gz\ncd libs\ntar zxf sqlite-3.2.8.tar.gz\ncd sqlite-3.2.8\n./configure\nsed -e s/--VERS--/3.2.8/ ./src/sqlite.h.in | \\\nsed -e s/--VERSION-NUMBER--/3002008/ >sqlite3.h\ngcc -g -O2 -o lemon ./tool/lemon.c\ncp ./tool/lempar.c .\ncp ./src/parse.y .\n./lemon -DSQLITE_OMIT_CURSOR           parse.y\ncat parse.h ./src/vdbe.c | awk -f ./mkopcodeh.awk >opcodes.h\nmake keywordhash.h\nmake opcodes.c\nexit 0;\n";
                };
-<<<<<<< .mine
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-               D30F70DF09BF6ECA00A494C4 /* Sources */ = {
+               D31D4A4809BEBF01001112B8 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               D30F70E709BF6EFF00A494C4 /* mod_echo.c in Sources */,
+                               D31D4DEA09BEC389001112B8 /* apr_atomic.c in Sources */,
+                               D31D4DD009BEC33D001112B8 /* copy.c in Sources */,
+                               D31D4DD109BEC33D001112B8 /* dir.c in Sources */,
+                               D31D4DD209BEC33D001112B8 /* fileacc.c in Sources */,
+                               D31D4DD309BEC33D001112B8 /* filedup.c in Sources */,
+                               D31D4DD409BEC33D001112B8 /* filepath.c in Sources */,
+                               D31D4DD509BEC33D001112B8 /* filepath_util.c in Sources */,
+                               D31D4DD609BEC33D001112B8 /* filestat.c in Sources */,
+                               D31D4DD709BEC33D001112B8 /* flock.c in Sources */,
+                               D31D4DD809BEC33D001112B8 /* fullrw.c in Sources */,
+                               D31D4DD909BEC33D001112B8 /* mktemp.c in Sources */,
+                               D31D4DDA09BEC33D001112B8 /* open.c in Sources */,
+                               D31D4DDB09BEC33D001112B8 /* pipe.c in Sources */,
+                               D31D4DDC09BEC33D001112B8 /* readwrite.c in Sources */,
+                               D31D4DDD09BEC33D001112B8 /* seek.c in Sources */,
+                               D31D4DDE09BEC33D001112B8 /* tempdir.c in Sources */,
+                               D31D4D5309BEC23C001112B8 /* dso.c in Sources */,
+                               D31D4D5409BEC23C001112B8 /* global_mutex.c in Sources */,
+                               D31D4D5509BEC23C001112B8 /* proc_mutex.c in Sources */,
+                               D31D4D5609BEC23C001112B8 /* thread_cond.c in Sources */,
+                               D31D4D5709BEC23C001112B8 /* thread_mutex.c in Sources */,
+                               D31D4D5809BEC23C001112B8 /* thread_rwlock.c in Sources */,
+                               D31D4D5909BEC23C001112B8 /* apr_pools.c in Sources */,
+                               D31D4D5A09BEC23C001112B8 /* charset.c in Sources */,
+                               D31D4D5B09BEC23C001112B8 /* env.c in Sources */,
+                               D31D4D5C09BEC23C001112B8 /* errorcodes.c in Sources */,
+                               D31D4D5D09BEC23C001112B8 /* getopt.c in Sources */,
+                               D31D4D5E09BEC23C001112B8 /* otherchild.c in Sources */,
+                               D31D4D5F09BEC23C001112B8 /* rand.c in Sources */,
+                               D31D4D6009BEC23C001112B8 /* start.c in Sources */,
+                               D31D4D6109BEC23C001112B8 /* version.c in Sources */,
+                               D31D4D6209BEC23C001112B8 /* common.c in Sources */,
+                               D31D4D6309BEC23C001112B8 /* mmap.c in Sources */,
+                               D31D4D6409BEC23C001112B8 /* inet_ntop.c in Sources */,
+                               D31D4D6509BEC23C001112B8 /* inet_pton.c in Sources */,
+                               D31D4D6609BEC23C001112B8 /* multicast.c in Sources */,
+                               D31D4D6709BEC23C001112B8 /* sendrecv.c in Sources */,
+                               D31D4D6809BEC23C001112B8 /* sockaddr.c in Sources */,
+                               D31D4D6909BEC23C001112B8 /* sockets.c in Sources */,
+                               D31D4D6A09BEC23C001112B8 /* sockopt.c in Sources */,
+                               D31D4D6B09BEC23C001112B8 /* apr_getpass.c in Sources */,
+                               D31D4D6C09BEC23C001112B8 /* epoll.c in Sources */,
+                               D31D4D6D09BEC23C001112B8 /* kqueue.c in Sources */,
+                               D31D4D6E09BEC23C001112B8 /* poll.c in Sources */,
+                               D31D4D6F09BEC23C001112B8 /* port.c in Sources */,
+                               D31D4D7009BEC23C001112B8 /* select.c in Sources */,
+                               D31D4D7109BEC23C001112B8 /* apr_random.c in Sources */,
+                               D31D4D7209BEC23C001112B8 /* sha2.c in Sources */,
+                               D31D4D7409BEC23C001112B8 /* sha2_glue.c in Sources */,
+                               D31D4D7509BEC23C001112B8 /* shm.c in Sources */,
+                               D31D4D7609BEC23C001112B8 /* apr_cpystrn.c in Sources */,
+                               D31D4D7709BEC23C001112B8 /* apr_fnmatch.c in Sources */,
+                               D31D4D7809BEC23C001112B8 /* apr_snprintf.c in Sources */,
+                               D31D4D7909BEC23C001112B8 /* apr_strings.c in Sources */,
+                               D31D4D7A09BEC23C001112B8 /* apr_strnatcmp.c in Sources */,
+                               D31D4D7B09BEC23C001112B8 /* apr_strtok.c in Sources */,
+                               D31D4D7C09BEC23C001112B8 /* waitio.c in Sources */,
+                               D31D4D7D09BEC23C001112B8 /* apr_hash.c in Sources */,
+                               D31D4D7E09BEC23C001112B8 /* apr_tables.c in Sources */,
+                               D31D4D7F09BEC23C001112B8 /* proc.c in Sources */,
+                               D31D4D8009BEC23C001112B8 /* procsup.c in Sources */,
+                               D31D4D8109BEC23C001112B8 /* signals.c in Sources */,
+                               D31D4D8209BEC23C001112B8 /* thread.c in Sources */,
+                               D31D4D8309BEC23C001112B8 /* threadpriv.c in Sources */,
+                               D31D4D8409BEC23C001112B8 /* time.c in Sources */,
+                               D31D4D8509BEC23C001112B8 /* timestr.c in Sources */,
+                               D31D4D8609BEC23C001112B8 /* groupinfo.c in Sources */,
+                               D31D4D8709BEC23C001112B8 /* userinfo.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               D31D4A4809BEBF01001112B8 /* Sources */ = {
+               D31D4DED09BEC3A1001112B8 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
-=======
-               D3C7A85B09BF6066009127A4 /* ShellScript */ = {
-                       isa = PBXShellScriptBuildPhase;
->>>>>>> .r812
                        buildActionMask = 2147483647;
                        files = (
-                       );
-                       inputPaths = (
-                       );
-                       outputPaths = (
+                               D31D4E2609BEC3BE001112B8 /* apr_atomic.c in Sources */,
+                               D31D4E2709BEC3BE001112B8 /* copy.c in Sources */,
+                               D31D4E2809BEC3BE001112B8 /* dir.c in Sources */,
+                               D31D4E2909BEC3BE001112B8 /* fileacc.c in Sources */,
+                               D31D4E2A09BEC3BE001112B8 /* filedup.c in Sources */,
+                               D31D4E2B09BEC3BE001112B8 /* filepath.c in Sources */,
+                               D31D4E2C09BEC3BE001112B8 /* filepath_util.c in Sources */,
+                               D31D4E2D09BEC3BE001112B8 /* filestat.c in Sources */,
+                               D31D4E2E09BEC3BE001112B8 /* flock.c in Sources */,
+                               D31D4E2F09BEC3BE001112B8 /* fullrw.c in Sources */,
+                               D31D4E3009BEC3BE001112B8 /* mktemp.c in Sources */,
+                               D31D4E3109BEC3BE001112B8 /* open.c in Sources */,
+                               D31D4E3209BEC3BE001112B8 /* pipe.c in Sources */,
+                               D31D4E3309BEC3BE001112B8 /* readwrite.c in Sources */,
+                               D31D4E3409BEC3BE001112B8 /* seek.c in Sources */,
+                               D31D4E3509BEC3BE001112B8 /* tempdir.c in Sources */,
+                               D31D4E3609BEC3BE001112B8 /* dso.c in Sources */,
+                               D31D4E3709BEC3BE001112B8 /* global_mutex.c in Sources */,
+                               D31D4E3809BEC3BE001112B8 /* proc_mutex.c in Sources */,
+                               D31D4E3909BEC3BE001112B8 /* thread_cond.c in Sources */,
+                               D31D4E3A09BEC3BE001112B8 /* thread_mutex.c in Sources */,
+                               D31D4E3B09BEC3BE001112B8 /* thread_rwlock.c in Sources */,
+                               D31D4E3C09BEC3BE001112B8 /* apr_pools.c in Sources */,
+                               D31D4E3D09BEC3BE001112B8 /* charset.c in Sources */,
+                               D31D4E3E09BEC3BE001112B8 /* env.c in Sources */,
+                               D31D4E3F09BEC3BE001112B8 /* errorcodes.c in Sources */,
+                               D31D4E4009BEC3BE001112B8 /* getopt.c in Sources */,
+                               D31D4E4109BEC3BE001112B8 /* otherchild.c in Sources */,
+                               D31D4E4209BEC3BE001112B8 /* rand.c in Sources */,
+                               D31D4E4309BEC3BE001112B8 /* start.c in Sources */,
+                               D31D4E4409BEC3BE001112B8 /* version.c in Sources */,
+                               D31D4E4509BEC3BE001112B8 /* common.c in Sources */,
+                               D31D4E4609BEC3BE001112B8 /* mmap.c in Sources */,
+                               D31D4E4709BEC3BE001112B8 /* inet_ntop.c in Sources */,
+                               D31D4E4809BEC3BE001112B8 /* inet_pton.c in Sources */,
+                               D31D4E4909BEC3BE001112B8 /* multicast.c in Sources */,
+                               D31D4E4A09BEC3BE001112B8 /* sendrecv.c in Sources */,
+                               D31D4E4B09BEC3BE001112B8 /* sockaddr.c in Sources */,
+                               D31D4E4C09BEC3BE001112B8 /* sockets.c in Sources */,
+                               D31D4E4D09BEC3BE001112B8 /* sockopt.c in Sources */,
+                               D31D4E4E09BEC3BE001112B8 /* apr_getpass.c in Sources */,
+                               D31D4E4F09BEC3BE001112B8 /* epoll.c in Sources */,
+                               D31D4E5009BEC3BE001112B8 /* kqueue.c in Sources */,
+                               D31D4E5109BEC3BE001112B8 /* poll.c in Sources */,
+                               D31D4E5209BEC3BE001112B8 /* port.c in Sources */,
+                               D31D4E5309BEC3BE001112B8 /* select.c in Sources */,
+                               D31D4E5409BEC3BE001112B8 /* apr_random.c in Sources */,
+                               D31D4E5509BEC3BE001112B8 /* sha2.c in Sources */,
+                               D31D4E5609BEC3BE001112B8 /* sha2_glue.c in Sources */,
+                               D31D4E5709BEC3BE001112B8 /* shm.c in Sources */,
+                               D31D4E5809BEC3BE001112B8 /* apr_cpystrn.c in Sources */,
+                               D31D4E5909BEC3BE001112B8 /* apr_fnmatch.c in Sources */,
+                               D31D4E5A09BEC3BE001112B8 /* apr_snprintf.c in Sources */,
+                               D31D4E5B09BEC3BE001112B8 /* apr_strings.c in Sources */,
+                               D31D4E5C09BEC3BE001112B8 /* apr_strnatcmp.c in Sources */,
+                               D31D4E5D09BEC3BE001112B8 /* apr_strtok.c in Sources */,
+                               D31D4E5E09BEC3BE001112B8 /* waitio.c in Sources */,
+                               D31D4E5F09BEC3BE001112B8 /* apr_hash.c in Sources */,
+                               D31D4E6009BEC3BE001112B8 /* apr_tables.c in Sources */,
+                               D31D4E6109BEC3BE001112B8 /* proc.c in Sources */,
+                               D31D4E6209BEC3BE001112B8 /* procsup.c in Sources */,
+                               D31D4E6309BEC3BE001112B8 /* signals.c in Sources */,
+                               D31D4E6409BEC3BE001112B8 /* thread.c in Sources */,
+                               D31D4E6509BEC3BE001112B8 /* threadpriv.c in Sources */,
+                               D31D4E6609BEC3BE001112B8 /* time.c in Sources */,
+                               D31D4E6709BEC3BE001112B8 /* timestr.c in Sources */,
+                               D31D4E6809BEC3BE001112B8 /* groupinfo.c in Sources */,
+                               D31D4E6909BEC3BE001112B8 /* userinfo.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/bash;
-                       shellScript = "./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$INSTALL_PATH\nexit 0";
                };
-               D3C7A86009BF60A1009127A4 /* ShellScript */ = {
-                       isa = PBXShellScriptBuildPhase;
+               D31D4E7709BEC533001112B8 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D31D4F4109BEC6D8001112B8 /* apr_brigade.c in Sources */,
+                               D31D4F4209BEC6D8001112B8 /* apr_buckets.c in Sources */,
+                               D31D4F4309BEC6D8001112B8 /* apr_buckets_alloc.c in Sources */,
+                               D31D4F4409BEC6D8001112B8 /* apr_buckets_eos.c in Sources */,
+                               D31D4F4509BEC6D8001112B8 /* apr_buckets_file.c in Sources */,
+                               D31D4F4609BEC6D8001112B8 /* apr_buckets_flush.c in Sources */,
+                               D31D4F4709BEC6D8001112B8 /* apr_buckets_heap.c in Sources */,
+                               D31D4F4809BEC6D8001112B8 /* apr_buckets_mmap.c in Sources */,
+                               D31D4F4909BEC6D8001112B8 /* apr_buckets_pipe.c in Sources */,
+                               D31D4F4A09BEC6D8001112B8 /* apr_buckets_pool.c in Sources */,
+                               D31D4F4B09BEC6D8001112B8 /* apr_buckets_refcount.c in Sources */,
+                               D31D4F4C09BEC6D8001112B8 /* apr_buckets_simple.c in Sources */,
+                               D31D4F4D09BEC6D8001112B8 /* apr_buckets_socket.c in Sources */,
+                               D31D4F4E09BEC6D8001112B8 /* apr_md4.c in Sources */,
+                               D31D4F4F09BEC6D8001112B8 /* apr_md5.c in Sources */,
+                               D31D4F5009BEC6D8001112B8 /* apr_sha1.c in Sources */,
+                               D31D4F5109BEC6D8001112B8 /* getuuid.c in Sources */,
+                               D31D4F5209BEC6D8001112B8 /* uuid.c in Sources */,
+                               D31D4F5309BEC6D8001112B8 /* apr_dbd.c in Sources */,
+                               D31D4F5409BEC6D8001112B8 /* apr_dbd_pgsql.c in Sources */,
+                               D31D4F5509BEC6D8001112B8 /* apr_dbd_sqlite2.c in Sources */,
+                               D31D4F5609BEC6D8001112B8 /* apr_dbd_sqlite3.c in Sources */,
+                               D31D4F5709BEC6D8001112B8 /* apr_dbm.c in Sources */,
+                               D31D4F5809BEC6D8001112B8 /* apr_dbm_berkeleydb.c in Sources */,
+                               D31D4F5909BEC6D8001112B8 /* apr_dbm_gdbm.c in Sources */,
+                               D31D4F5A09BEC6D8001112B8 /* apr_dbm_ndbm.c in Sources */,
+                               D31D4F5B09BEC6D8001112B8 /* apr_dbm_sdbm.c in Sources */,
+                               D31D4F5C09BEC6D8001112B8 /* sdbm.c in Sources */,
+                               D31D4F5D09BEC6D8001112B8 /* sdbm_hash.c in Sources */,
+                               D31D4F5E09BEC6D8001112B8 /* sdbm_lock.c in Sources */,
+                               D31D4F5F09BEC6D8001112B8 /* sdbm_pair.c in Sources */,
+                               D31D4F6309BEC6D8001112B8 /* apr_base64.c in Sources */,
+                               D31D4F6409BEC6D8001112B8 /* apr_hooks.c in Sources */,
+                               D31D4F6509BEC6D8001112B8 /* apr_ldap_init.c in Sources */,
+                               D31D4F6609BEC6D8001112B8 /* apr_ldap_option.c in Sources */,
+                               D31D4F6709BEC6D8001112B8 /* apr_ldap_url.c in Sources */,
+                               D31D4F6809BEC6D8001112B8 /* apr_date.c in Sources */,
+                               D31D4F6909BEC6D8001112B8 /* apr_queue.c in Sources */,
+                               D31D4F6A09BEC6D8001112B8 /* apr_reslist.c in Sources */,
+                               D31D4F6B09BEC6D8001112B8 /* apr_rmm.c in Sources */,
+                               D31D4F6C09BEC6D8001112B8 /* apu_version.c in Sources */,
+                               D31D4F6D09BEC6D8001112B8 /* apr_strmatch.c in Sources */,
+                               D31D4F6E09BEC6D8001112B8 /* apr_uri.c in Sources */,
+                               D31D4F7009BEC6D8001112B8 /* xlate.c in Sources */,
                        );
-                       inputPaths = (
-                       );
-                       outputPaths = (
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D31D4FB309BEC85A001112B8 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D31D4FDA09BEC87B001112B8 /* apr_brigade.c in Sources */,
+                               D31D4FDB09BEC87B001112B8 /* apr_buckets.c in Sources */,
+                               D31D4FDC09BEC87B001112B8 /* apr_buckets_alloc.c in Sources */,
+                               D31D4FDD09BEC87B001112B8 /* apr_buckets_eos.c in Sources */,
+                               D31D4FDE09BEC87B001112B8 /* apr_buckets_file.c in Sources */,
+                               D31D4FDF09BEC87B001112B8 /* apr_buckets_flush.c in Sources */,
+                               D31D4FE009BEC87B001112B8 /* apr_buckets_heap.c in Sources */,
+                               D31D4FE109BEC87B001112B8 /* apr_buckets_mmap.c in Sources */,
+                               D31D4FE209BEC87B001112B8 /* apr_buckets_pipe.c in Sources */,
+                               D31D4FE309BEC87B001112B8 /* apr_buckets_pool.c in Sources */,
+                               D31D4FE409BEC87B001112B8 /* apr_buckets_refcount.c in Sources */,
+                               D31D4FE509BEC87B001112B8 /* apr_buckets_simple.c in Sources */,
+                               D31D4FE609BEC87B001112B8 /* apr_buckets_socket.c in Sources */,
+                               D31D4FE709BEC87B001112B8 /* apr_md4.c in Sources */,
+                               D31D4FE809BEC87B001112B8 /* apr_md5.c in Sources */,
+                               D31D4FE909BEC87B001112B8 /* apr_sha1.c in Sources */,
+                               D31D4FEA09BEC87B001112B8 /* getuuid.c in Sources */,
+                               D31D4FEB09BEC87B001112B8 /* uuid.c in Sources */,
+                               D31D4FEC09BEC87B001112B8 /* apr_dbd.c in Sources */,
+                               D31D4FED09BEC87B001112B8 /* apr_dbd_pgsql.c in Sources */,
+                               D31D4FEE09BEC87B001112B8 /* apr_dbd_sqlite2.c in Sources */,
+                               D31D4FEF09BEC87B001112B8 /* apr_dbd_sqlite3.c in Sources */,
+                               D31D4FF009BEC87B001112B8 /* apr_dbm.c in Sources */,
+                               D31D4FF109BEC87B001112B8 /* apr_dbm_berkeleydb.c in Sources */,
+                               D31D4FF209BEC87B001112B8 /* apr_dbm_gdbm.c in Sources */,
+                               D31D4FF309BEC87B001112B8 /* apr_dbm_ndbm.c in Sources */,
+                               D31D4FF409BEC87B001112B8 /* apr_dbm_sdbm.c in Sources */,
+                               D31D4FF509BEC87B001112B8 /* sdbm.c in Sources */,
+                               D31D4FF609BEC87B001112B8 /* sdbm_hash.c in Sources */,
+                               D31D4FF709BEC87B001112B8 /* sdbm_lock.c in Sources */,
+                               D31D4FF809BEC87B001112B8 /* sdbm_pair.c in Sources */,
+                               D31D4FF909BEC87B001112B8 /* apr_base64.c in Sources */,
+                               D31D4FFA09BEC87B001112B8 /* apr_hooks.c in Sources */,
+                               D31D4FFB09BEC87B001112B8 /* apr_ldap_init.c in Sources */,
+                               D31D4FFC09BEC87B001112B8 /* apr_ldap_option.c in Sources */,
+                               D31D4FFD09BEC87B001112B8 /* apr_ldap_url.c in Sources */,
+                               D31D4FFE09BEC87B001112B8 /* apr_date.c in Sources */,
+                               D31D4FFF09BEC87B001112B8 /* apr_queue.c in Sources */,
+                               D31D500009BEC87B001112B8 /* apr_reslist.c in Sources */,
+                               D31D500109BEC87B001112B8 /* apr_rmm.c in Sources */,
+                               D31D500209BEC87B001112B8 /* apu_version.c in Sources */,
+                               D31D500309BEC87B001112B8 /* apr_strmatch.c in Sources */,
+                               D31D500409BEC87B001112B8 /* apr_uri.c in Sources */,
+                               D31D500609BEC87B001112B8 /* xlate.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "./build/buildlib.sh . install libteletone --prefix=$INSTALL_PATH\nexit 0";
                };
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
                D31D503F09BECA92001112B8 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               D346F17709BF38AE00404918 /* Sources */ = {
+               D3A7639009BEAB96002E9B53 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D3A763A809BEAD00002E9B53 /* filterkit.c in Sources */,
+                               D3A763A909BEAD00002E9B53 /* resample.c in Sources */,
+                               D3A763AA09BEAD00002E9B53 /* resamplesubs.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D3A763F009BEB1CF002E9B53 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D3A763F409BEB1ED002E9B53 /* libteletone_detect.c in Sources */,
+                               D3A763F509BEB1ED002E9B53 /* libteletone_generate.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D3A7640409BEB286002E9B53 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D3A7641109BEB2DB002E9B53 /* libteletone_detect.c in Sources */,
+                               D3A7641209BEB2DB002E9B53 /* libteletone_generate.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D3A7642C09BEB480002E9B53 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               D346F17E09BF38F800404918 /* mod_echo.c in Sources */,
+                               D3A7666009BEB5EA002E9B53 /* alter.c in Sources */,
+                               D3A7666109BEB5EA002E9B53 /* analyze.c in Sources */,
+                               D3A7666209BEB5EA002E9B53 /* attach.c in Sources */,
+                               D3A7666309BEB5EA002E9B53 /* auth.c in Sources */,
+                               D3A7666409BEB5EA002E9B53 /* btree.c in Sources */,
+                               D3A7666509BEB5EA002E9B53 /* build.c in Sources */,
+                               D3A7666609BEB5EA002E9B53 /* callback.c in Sources */,
+                               D3A7666709BEB5EA002E9B53 /* complete.c in Sources */,
+                               D3A7666909BEB5EA002E9B53 /* date.c in Sources */,
+                               D3A7666A09BEB5EA002E9B53 /* delete.c in Sources */,
+                               D3A7666C09BEB5EA002E9B53 /* experimental.c in Sources */,
+                               D3A7666D09BEB5EA002E9B53 /* expr.c in Sources */,
+                               D3A7666E09BEB5EA002E9B53 /* func.c in Sources */,
+                               D3A7666F09BEB5EA002E9B53 /* hash.c in Sources */,
+                               D3A7667009BEB5EA002E9B53 /* insert.c in Sources */,
+                               D3A7667109BEB5EA002E9B53 /* legacy.c in Sources */,
+                               D3A7667509BEB5EA002E9B53 /* main.c in Sources */,
+                               D3A7667609BEB5EA002E9B53 /* md5.c in Sources */,
+                               D3A7667809BEB5EA002E9B53 /* os_test.c in Sources */,
+                               D3A7667909BEB5EA002E9B53 /* os_unix.c in Sources */,
+                               D3A7667A09BEB5EA002E9B53 /* os_win.c in Sources */,
+                               D3A7667B09BEB5EA002E9B53 /* pager.c in Sources */,
+                               D3A7667C09BEB5EA002E9B53 /* parse.c in Sources */,
+                               D3A7667D09BEB5EA002E9B53 /* pragma.c in Sources */,
+                               D3A7667E09BEB5EA002E9B53 /* prepare.c in Sources */,
+                               D3A7667F09BEB5EA002E9B53 /* printf.c in Sources */,
+                               D3A7668009BEB5EA002E9B53 /* random.c in Sources */,
+                               D3A7668109BEB5EA002E9B53 /* select.c in Sources */,
+                               D3A7668309BEB5EA002E9B53 /* showjournal.c in Sources */,
+                               D3A7668409BEB5EA002E9B53 /* table.c in Sources */,
+                               D3A7668509BEB5EA002E9B53 /* tclsqlite.c in Sources */,
+                               D3A7668609BEB5EA002E9B53 /* test1.c in Sources */,
+                               D3A7668709BEB5EA002E9B53 /* test2.c in Sources */,
+                               D3A7668809BEB5EA002E9B53 /* test3.c in Sources */,
+                               D3A7668909BEB5EA002E9B53 /* test4.c in Sources */,
+                               D3A7668A09BEB5EA002E9B53 /* test5.c in Sources */,
+                               D3A7668D09BEB5EA002E9B53 /* tokenize.c in Sources */,
+                               D3A7668E09BEB5EA002E9B53 /* trigger.c in Sources */,
+                               D3A7668F09BEB5EA002E9B53 /* update.c in Sources */,
+                               D3A7669009BEB5EA002E9B53 /* utf.c in Sources */,
+                               D3A7669109BEB5EA002E9B53 /* util.c in Sources */,
+                               D3A7669209BEB5EA002E9B53 /* vacuum.c in Sources */,
+                               D3A7669309BEB5EA002E9B53 /* vdbe.c in Sources */,
+                               D3A7669409BEB5EA002E9B53 /* vdbeapi.c in Sources */,
+                               D3A7669509BEB5EA002E9B53 /* vdbeaux.c in Sources */,
+                               D3A7669609BEB5EA002E9B53 /* vdbefifo.c in Sources */,
+                               D3A7669709BEB5EA002E9B53 /* vdbemem.c in Sources */,
+                               D3A7669809BEB5EA002E9B53 /* where.c in Sources */,
+                               D3A766DB09BEB7CF002E9B53 /* opcodes.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               D3C7A72009BF467F009127A4 /* Sources */ = {
+               D3A7676909BEBCF7002E9B53 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               D3C7A72409BF4692009127A4 /* mod_bridgecall.c in Sources */,
+                               D3A7676D09BEBD09002E9B53 /* opcodes.c in Sources */,
+                               D3A7676E09BEBD09002E9B53 /* alter.c in Sources */,
+                               D3A7676F09BEBD09002E9B53 /* analyze.c in Sources */,
+                               D3A7677009BEBD09002E9B53 /* attach.c in Sources */,
+                               D3A7677109BEBD09002E9B53 /* auth.c in Sources */,
+                               D3A7677209BEBD09002E9B53 /* btree.c in Sources */,
+                               D3A7677309BEBD09002E9B53 /* build.c in Sources */,
+                               D3A7677409BEBD09002E9B53 /* callback.c in Sources */,
+                               D3A7677509BEBD09002E9B53 /* complete.c in Sources */,
+                               D3A7677609BEBD09002E9B53 /* date.c in Sources */,
+                               D3A7677709BEBD09002E9B53 /* delete.c in Sources */,
+                               D3A7677809BEBD09002E9B53 /* experimental.c in Sources */,
+                               D3A7677909BEBD09002E9B53 /* expr.c in Sources */,
+                               D3A7677A09BEBD09002E9B53 /* func.c in Sources */,
+                               D3A7677B09BEBD09002E9B53 /* hash.c in Sources */,
+                               D3A7677C09BEBD09002E9B53 /* insert.c in Sources */,
+                               D3A7677D09BEBD09002E9B53 /* legacy.c in Sources */,
+                               D3A7677E09BEBD09002E9B53 /* main.c in Sources */,
+                               D3A7677F09BEBD09002E9B53 /* md5.c in Sources */,
+                               D3A7678009BEBD09002E9B53 /* os_test.c in Sources */,
+                               D3A7678109BEBD09002E9B53 /* os_unix.c in Sources */,
+                               D3A7678209BEBD09002E9B53 /* os_win.c in Sources */,
+                               D3A7678309BEBD09002E9B53 /* pager.c in Sources */,
+                               D3A7678409BEBD09002E9B53 /* parse.c in Sources */,
+                               D3A7678509BEBD09002E9B53 /* pragma.c in Sources */,
+                               D3A7678609BEBD09002E9B53 /* prepare.c in Sources */,
+                               D3A7678709BEBD09002E9B53 /* printf.c in Sources */,
+                               D3A7678809BEBD09002E9B53 /* random.c in Sources */,
+                               D3A7678909BEBD09002E9B53 /* select.c in Sources */,
+                               D3A7678A09BEBD09002E9B53 /* showjournal.c in Sources */,
+                               D3A7678B09BEBD09002E9B53 /* table.c in Sources */,
+                               D3A7678C09BEBD09002E9B53 /* tclsqlite.c in Sources */,
+                               D3A7678D09BEBD09002E9B53 /* test1.c in Sources */,
+                               D3A7678E09BEBD09002E9B53 /* test2.c in Sources */,
+                               D3A7678F09BEBD09002E9B53 /* test3.c in Sources */,
+                               D3A7679009BEBD09002E9B53 /* test4.c in Sources */,
+                               D3A7679109BEBD09002E9B53 /* test5.c in Sources */,
+                               D3A7679209BEBD09002E9B53 /* tokenize.c in Sources */,
+                               D3A7679309BEBD09002E9B53 /* trigger.c in Sources */,
+                               D3A7679409BEBD09002E9B53 /* update.c in Sources */,
+                               D3A7679509BEBD09002E9B53 /* utf.c in Sources */,
+                               D3A7679609BEBD09002E9B53 /* util.c in Sources */,
+                               D3A7679709BEBD09002E9B53 /* vacuum.c in Sources */,
+                               D3A7679809BEBD09002E9B53 /* vdbe.c in Sources */,
+                               D3A7679909BEBD09002E9B53 /* vdbeapi.c in Sources */,
+                               D3A7679A09BEBD09002E9B53 /* vdbeaux.c in Sources */,
+                               D3A7679B09BEBD09002E9B53 /* vdbefifo.c in Sources */,
+                               D3A7679C09BEBD09002E9B53 /* vdbemem.c in Sources */,
+                               D3A7679D09BEBD09002E9B53 /* where.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-<<<<<<< .mine
-               D30F712109BF743D00A494C4 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = D30F70E109BF6ECA00A494C4 /* mod_echo.dylib */;
-                       targetProxy = D30F712009BF743D00A494C4 /* PBXContainerItemProxy */;
-               };
                D31D4E6F09BEC40B001112B8 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = D31D4A4A09BEBF01001112B8 /* libapr.dylib */;
                        target = D31D4FB509BEC85A001112B8 /* libapr-util.a */;
                        targetProxy = D31D500A09BEC88E001112B8 /* PBXContainerItemProxy */;
                };
-=======
->>>>>>> .r812
                D31D508B09BECB94001112B8 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = D31D504109BECA92001112B8 /* libfreeswitch.dylib */;
                        target = D31D508F09BECBA3001112B8 /* freeswitch */;
                        targetProxy = D31D50B009BECE4C001112B8 /* PBXContainerItemProxy */;
                };
-               D3C7A71509BF418C009127A4 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = D346F17909BF38AE00404918 /* mod_echo.dylib */;
-                       targetProxy = D3C7A71409BF418C009127A4 /* PBXContainerItemProxy */;
-               };
-               D3C7A73909BF47A5009127A4 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = D3C7A72209BF467F009127A4 /* mod_bridgecall.dylib */;
-                       targetProxy = D3C7A73809BF47A5009127A4 /* PBXContainerItemProxy */;
-               };
-               D3C7A83E09BF5F94009127A4 /* PBXTargetDependency */ = {
+               D3A7640009BEB27C002E9B53 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = D3C7A80209BF5B43009127A4 /* sqlite-3.2.8 */;
-                       targetProxy = D3C7A83D09BF5F94009127A4 /* PBXContainerItemProxy */;
+                       target = D3A763F209BEB1CF002E9B53 /* libteletone.a */;
+                       targetProxy = D3A763FF09BEB27C002E9B53 /* PBXContainerItemProxy */;
                };
-               D3C7A84F09BF602F009127A4 /* PBXTargetDependency */ = {
+               D3A7640209BEB27E002E9B53 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = D3C7A84009BF5FC2009127A4 /* apr-util-1.2.2 */;
-                       targetProxy = D3C7A84E09BF602F009127A4 /* PBXContainerItemProxy */;
+                       target = D3A7639209BEAB96002E9B53 /* libresample.a */;
+                       targetProxy = D3A7640109BEB27E002E9B53 /* PBXContainerItemProxy */;
                };
-               D3C7A85109BF6039009127A4 /* PBXTargetDependency */ = {
+               D3A7640909BEB296002E9B53 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = D3C7A7EC09BF58D2009127A4 /* apr-1.2.2 */;
-                       targetProxy = D3C7A85009BF6039009127A4 /* PBXContainerItemProxy */;
+                       target = D3A7640609BEB286002E9B53 /* libteletone.dylib */;
+                       targetProxy = D3A7640809BEB296002E9B53 /* PBXContainerItemProxy */;
                };
-               D3C7A85F09BF6098009127A4 /* PBXTargetDependency */ = {
+               D3A767BA09BEBD8B002E9B53 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = D3C7A85C09BF6066009127A4 /* resample-0.1.3 */;
-                       targetProxy = D3C7A85E09BF6098009127A4 /* PBXContainerItemProxy */;
+                       target = D3A7642E09BEB480002E9B53 /* libsqlite3.dylib */;
+                       targetProxy = D3A767B909BEBD8B002E9B53 /* PBXContainerItemProxy */;
                };
-               D3C7A87409BF60F2009127A4 /* PBXTargetDependency */ = {
+               D3A767BC09BEBD8D002E9B53 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = D3C7A86109BF60A1009127A4 /* teletone */;
-                       targetProxy = D3C7A87309BF60F2009127A4 /* PBXContainerItemProxy */;
-               };
-               D3C7A95909BF6A15009127A4 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = D31D504109BECA92001112B8 /* libfreeswitch.dylib */;
-                       targetProxy = D3C7A95809BF6A15009127A4 /* PBXContainerItemProxy */;
+                       target = D3A7676B09BEBCF7002E9B53 /* libsqlite3.a */;
+                       targetProxy = D3A767BB09BEBD8D002E9B53 /* PBXContainerItemProxy */;
                };
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-<<<<<<< .mine
-               D30F70E409BF6EF200A494C4 /* Debug */ = {
-=======
-               D31D504709BECAAA001112B8 /* Debug */ = {
->>>>>>> .r812
+               D31D4A5009BEBF5D001112B8 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
-                               EXECUTABLE_PREFIX = "";
+                               EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-<<<<<<< .mine
-                               INSTALL_PATH = /usr/local/freeswitch/lib;
-=======
-                               HEADER_SEARCH_PATHS = "";
-                               INSTALL_PATH = /usr/local/freeswitch/lib;
-                               LIBRARY_SEARCH_PATHS = "$(INSTALL_PATH)";
+                               INSTALL_PATH = /usr/local/lib;
                                OTHER_CFLAGS = (
-                                       "-DHAVE_CONFIG_H",
-                                       "-I.",
-                                       "-I./src/include",
-                                       "-I$(INSTALL_PATH)/../include",
                                        "-g",
                                        "-O2",
-                                       "-DMACOSX",
+                               );
+                               OTHER_CPLUSPLUSFLAGS = (
+                                       "$(OTHER_CFLAGS)",
+                                       "-DDARWIN",
                                        "-DSIGPROCMASK_SETS_THREAD_MASK",
                                        "-no-cpp-precomp",
-                                       "-I$(INSTALL_PATH)/../include/apr-1",
-                               );
->>>>>>> .r812
-                               OTHER_LDFLAGS = (
-                                       "-lapr-1",
-                                       "-laprutil-1",
-                                       "-lresample",
-                                       "-lsqlite3",
-                                       "-lexpat",
-                                       "-liconv",
                                );
                                PREBINDING = NO;
-<<<<<<< .mine
-                               PRODUCT_NAME = mod_echo;
-=======
-                               PRODUCT_NAME = freeswitch;
->>>>>>> .r812
+                               PRODUCT_NAME = apr;
                                ZERO_LINK = YES;
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-               D31D4A5009BEBF5D001112B8 /* Debug */ = {
-=======
-               D31D504809BECAAA001112B8 /* Release */ = {
->>>>>>> .r812
+               D31D4A5109BEBF5D001112B8 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = NO;
+                               COPY_PHASE_STRIP = YES;
                                EXECUTABLE_PREFIX = lib;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
+                               INSTALL_PATH = /usr/local/lib;
+                               OTHER_CFLAGS = (
+                                       "-g",
+                                       "-O2",
+                               );
+                               OTHER_CPLUSPLUSFLAGS = (
+                                       "$(OTHER_CFLAGS)",
+                                       "-DDARWIN",
+                                       "-DSIGPROCMASK_SETS_THREAD_MASK",
+                                       "-no-cpp-precomp",
+                               );
                                PREBINDING = NO;
-                               PRODUCT_NAME = freeswitch;
-                               ZERO_LINK = YES;
+                               PRODUCT_NAME = apr;
+                               ZERO_LINK = NO;
                        };
-                       name = Debug;
+                       name = Release;
                };
-               D31D509509BECBCB001112B8 /* Debug */ = {
+               D31D4E6C09BEC3E1001112B8 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-<<<<<<< .mine
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
-=======
-                               INSTALL_PATH = /usr/local/freeswitch;
-                               LIBRARY_SEARCH_PATHS = "$(INSTALL_PATH)/../lib";
->>>>>>> .r812
+                               INSTALL_PATH = /usr/local/lib;
                                OTHER_CFLAGS = (
-                                       "-DHAVE_CONFIG_H",
-                                       "-I.",
-                                       "-I./src/include",
-                                       "-I$(INSTALL_PATH)/include",
                                        "-g",
                                        "-O2",
-                                       "-DMACOSX",
+                               );
+                               OTHER_CPLUSPLUSFLAGS = (
+                                       "$(OTHER_CFLAGS)",
+                                       "-DDARWIN",
                                        "-DSIGPROCMASK_SETS_THREAD_MASK",
                                        "-no-cpp-precomp",
-                                       "-I$(INSTALL_PATH)/include/apr-1",
-                               );
-                               OTHER_LDFLAGS = (
-                                       "-lapr-1",
-                                       "-laprutil-1",
-                                       "-lresample",
-                                       "-lsqlite3",
-                                       "-lexpat",
-                                       "-liconv",
                                );
                                PREBINDING = NO;
-                               PRODUCT_NAME = freeswitch;
+                               PRODUCT_NAME = apr;
                                ZERO_LINK = YES;
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D31D509609BECBCB001112B8 /* Release */ = {
+               D31D4E6D09BEC3E1001112B8 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
-                               INSTALL_PATH = "$(HOME)/bin";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(LIBRARY_SEARCH_PATHS)",
-                                       "$(SRCROOT)/.xcodebuild/Debug",
+                               INSTALL_PATH = /usr/local/lib;
+                               OTHER_CFLAGS = (
+                                       "-g",
+                                       "-O2",
+                               );
+                               OTHER_CPLUSPLUSFLAGS = (
+                                       "$(OTHER_CFLAGS)",
+                                       "-DDARWIN",
+                                       "-DSIGPROCMASK_SETS_THREAD_MASK",
+                                       "-no-cpp-precomp",
                                );
                                PREBINDING = NO;
-                               PRODUCT_NAME = freeswitch;
+                               PRODUCT_NAME = apr;
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D346F17C09BF38BA00404918 /* Debug */ = {
+               D31D4E7E09BEC574001112B8 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
-                               EXECUTABLE_PREFIX = "";
+                               EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-<<<<<<< .mine
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
-=======
-                               INSTALL_PATH = /usr/local/freeswitch/mod;
-                               OTHER_CFLAGS = (
-                                       "-DHAVE_CONFIG_H",
-                                       "-I.",
-                                       "-I./src/include",
-                                       "-I$(INSTALL_PATH)/../include",
-                                       "-g",
-                                       "-O2",
-                                       "-DMACOSX",
-                                       "-DSIGPROCMASK_SETS_THREAD_MASK",
-                                       "-no-cpp-precomp",
-                                       "-I$(INSTALL_PATH)/../include/apr-1",
-                               );
->>>>>>> .r812
+                               INSTALL_PATH = /usr/local/lib;
                                OTHER_LDFLAGS = (
-                                       "-lapr-1",
-                                       "-lexpat",
                                        "-liconv",
+                                       "-lsqlite3",
+                                       "-lapr",
                                );
                                PREBINDING = NO;
-                               PRODUCT_NAME = mod_echo;
-                               USER_HEADER_SEARCH_PATHS = "$(INSTALL_PATH)/../lib";
+                               PRODUCT_NAME = "apr-util";
                                ZERO_LINK = YES;
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D346F17D09BF38BA00404918 /* Release */ = {
+               D31D4E7F09BEC574001112B8 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
                                GCC_MODEL_TUNING = G5;
                                INSTALL_PATH = /usr/local/lib;
                                PREBINDING = NO;
-                               PRODUCT_NAME = mod_echo;
+                               PRODUCT_NAME = "apr-util";
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D3A7638209BEAAEE002E9B53 /* Debug */ = {
+               D31D501009BEC8B9001112B8 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
-<<<<<<< .mine
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
+                               INSTALL_PATH = /usr/local/lib;
                                PREBINDING = NO;
                                PRODUCT_NAME = "apr-util";
                                ZERO_LINK = YES;
-=======
-                               INSTALL_PATH = /usr/local/freeswitch;
->>>>>>> .r812
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D3A7638309BEAAEE002E9B53 /* Release */ = {
+               D31D501109BEC8B9001112B8 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = "apr-util";
+                               ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D3A7641E09BEB306002E9B53 /* Debug */ = {
+               D31D504709BECAAA001112B8 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-<<<<<<< .mine
-                               HEADER_SEARCH_PATHS = "$(INSTALL_PATH)/../include";
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
-                               MACOSX_DEPLOYMENT_TARGET = "";
-                               OTHER_CFLAGS = (
-                                       "-DMACOSX",
-                                       "-DSWITCH_PREFIX_DIR=\"$(INSTALL_PATH)/../\"",
-                               );
+                               INSTALL_PATH = /usr/local/lib;
                                PREBINDING = NO;
-                               PRIVATE_HEADERS_FOLDER_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/include";
                                PRODUCT_NAME = freeswitch;
-                               PUBLIC_HEADERS_FOLDER_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/include";
                                ZERO_LINK = YES;
-=======
-                               PRODUCT_NAME = All;
->>>>>>> .r812
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D3A7641F09BEB306002E9B53 /* Release */ = {
+               D31D504809BECAAA001112B8 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               PRODUCT_NAME = All;
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = freeswitch;
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D3C7A72B09BF46C9009127A4 /* Debug */ = {
+               D31D509509BECBCB001112B8 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
-                               EXECUTABLE_PREFIX = "";
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               HEADER_SEARCH_PATHS = "$(INSTALL_PATH)/../lib";
-                               INSTALL_PATH = /usr/local/freeswitch/lib;
-                               OTHER_CFLAGS = (
-                                       "-DHAVE_CONFIG_H",
-                                       "-I.",
-                                       "-I./src/include",
-                                       "-I$(INSTALL_PATH)/../include",
-                                       "-g",
-                                       "-O2",
-                                       "-DMACOSX",
-                                       "-DSIGPROCMASK_SETS_THREAD_MASK",
-                                       "-no-cpp-precomp",
-                                       "-I$(INSTALL_PATH)/../include/apr-1",
+                               INSTALL_PATH = "$(HOME)/bin";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(LIBRARY_SEARCH_PATHS)",
+                                       "$(SRCROOT)/.xcodebuild/Debug",
                                );
-<<<<<<< .mine
                                PREBINDING = NO;
                                PRODUCT_NAME = freeswitch;
                                ZERO_LINK = YES;
                        };
                        name = Debug;
                };
+               D31D509609BECBCB001112B8 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = YES;
+                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = "$(HOME)/bin";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(LIBRARY_SEARCH_PATHS)",
+                                       "$(SRCROOT)/.xcodebuild/Debug",
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = freeswitch;
+                               ZERO_LINK = NO;
+                       };
+                       name = Release;
+               };
                D3A7638209BEAAEE002E9B53 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
-                               INSTALL_PATH = /usr/local;
                        };
                        name = Debug;
                };
+               D3A7638309BEAAEE002E9B53 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = YES;
+                       };
+                       name = Release;
+               };
                D3A7639609BEAB97002E9B53 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
+                               INSTALL_PATH = /usr/local/lib;
                                MACH_O_TYPE = staticlib;
                                PREBINDING = NO;
                                PRODUCT_NAME = resample;
-=======
-                               OTHER_LDFLAGS = (
-                                       "-lapr-1",
-                                       "-lexpat",
-                                       "-liconv",
-                               );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = mod_bridgecall;
->>>>>>> .r812
                                ZERO_LINK = YES;
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D3C7A72C09BF46C9009127A4 /* Release */ = {
+               D3A7639709BEAB97002E9B53 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
-                               EXECUTABLE_PREFIX = lib;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
                                INSTALL_PATH = /usr/local/lib;
                                PREBINDING = NO;
-                               PRODUCT_NAME = mod_bridgecall;
+                               PRODUCT_NAME = resample;
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D3C7A7F909BF58E5009127A4 /* Debug */ = {
+               D3A763FC09BEB216002E9B53 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
+                               EXECUTABLE_EXTENSION = a;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-<<<<<<< .mine
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
+                               INSTALL_PATH = /usr/local/lib;
                                MACH_O_TYPE = staticlib;
                                PREBINDING = NO;
                                PRODUCT_NAME = teletone;
                                ZERO_LINK = YES;
-=======
-                               PRODUCT_NAME = apr;
->>>>>>> .r812
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D3C7A7FA09BF58E5009127A4 /* Release */ = {
+               D3A763FD09BEB216002E9B53 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               PRODUCT_NAME = apr;
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = teletone;
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D3C7A80909BF5B98009127A4 /* Debug */ = {
+               D3A7641B09BEB306002E9B53 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-<<<<<<< .mine
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
+                               INSTALL_PATH = /usr/local/lib;
                                PREBINDING = NO;
                                PRODUCT_NAME = teletone;
-                               SKIP_INSTALL = NO;
                                ZERO_LINK = YES;
-=======
-                               PRODUCT_NAME = "sqlite-3.2.8";
->>>>>>> .r812
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D3C7A80A09BF5B98009127A4 /* Release */ = {
+               D3A7641C09BEB306002E9B53 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               PRODUCT_NAME = "sqlite-3.2.8";
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = teletone;
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D3C7A84C09BF5FF9009127A4 /* Debug */ = {
+               D3A7641E09BEB306002E9B53 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               PRODUCT_NAME = "apr-utile-1.2.2";
+                               PRODUCT_NAME = All;
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D3C7A84D09BF5FF9009127A4 /* Release */ = {
+               D3A7641F09BEB306002E9B53 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               PRODUCT_NAME = "apr-utile-1.2.2";
+                               PRODUCT_NAME = All;
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D3C7A86D09BF60A5009127A4 /* Debug */ = {
+               D3A7643609BEB4A7002E9B53 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-<<<<<<< .mine
-                               INSTALL_PATH = "$(INSTALL_PATH)/$(PROJECT_NAME)/lib";
+                               INSTALL_PATH = /usr/local/lib;
                                OTHER_CFLAGS = (
                                        "-DNDEBUG",
                                        "-DSQLITE_TEST=1",
                                PREBINDING = NO;
                                PRODUCT_NAME = sqlite3;
                                ZERO_LINK = YES;
-=======
-                               PRODUCT_NAME = "resample-0.1.3";
->>>>>>> .r812
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D3C7A86E09BF60A5009127A4 /* Release */ = {
+               D3A7643709BEB4A7002E9B53 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
+                               EXECUTABLE_PREFIX = lib;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               PRODUCT_NAME = "resample-0.1.3";
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = sqlite3;
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
-               D3C7A87009BF60A5009127A4 /* Debug */ = {
+               D3A767B609BEBD34002E9B53 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               PRODUCT_NAME = teletone;
+                               INSTALL_PATH = /usr/local/lib;
+                               OTHER_CFLAGS = (
+                                       "-DNDEBUG",
+                                       "-DSQLITE_TEST=1",
+                                       "-DPIC",
+                                       "-DOS_UNIX=1",
+                                       "-DTHREADSAFE=1",
+                                       "-DHAVE_USLEEP=1",
+                                       "-DSQLITE_OMIT_CURSOR",
+                                       "-DHAVE_READLINE=1",
+                                       "-I/usr/include/readline",
+                               );
+                               PREBINDING = NO;
+                               PRODUCT_NAME = sqlite3;
+                               ZERO_LINK = YES;
                        };
                        name = Debug;
                };
-<<<<<<< .mine
-=======
-               D3C7A87109BF60A5009127A4 /* Release */ = {
+               D3A767B709BEBD34002E9B53 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               PRODUCT_NAME = teletone;
+                               GCC_MODEL_TUNING = G5;
+                               INSTALL_PATH = /usr/local/lib;
+                               PREBINDING = NO;
+                               PRODUCT_NAME = sqlite3;
                                ZERO_LINK = NO;
                        };
                        name = Release;
                };
->>>>>>> .r812
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-<<<<<<< .mine
-               D30F70E309BF6EF200A494C4 /* Build configuration list for PBXNativeTarget "mod_echo.dylib" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               D30F70E409BF6EF200A494C4 /* Debug */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
-               };
                D31D4A4F09BEBF5D001112B8 /* Build configuration list for PBXNativeTarget "libapr.dylib" */ = {
-=======
-               D31D504609BECAAA001112B8 /* Build configuration list for PBXNativeTarget "libfreeswitch.dylib" */ = {
->>>>>>> .r812
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D31D4A5009BEBF5D001112B8 /* Debug */,
-=======
-                               D31D504709BECAAA001112B8 /* Debug */,
-                               D31D504809BECAAA001112B8 /* Release */,
->>>>>>> .r812
+                               D31D4A5109BEBF5D001112B8 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D31D509409BECBCB001112B8 /* Build configuration list for PBXNativeTarget "freeswitch" */ = {
+               D31D4E6B09BEC3E1001112B8 /* Build configuration list for PBXNativeTarget "libapr.a" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D31D4E6C09BEC3E1001112B8 /* Debug */,
-=======
-                               D31D509509BECBCB001112B8 /* Debug */,
-                               D31D509609BECBCB001112B8 /* Release */,
->>>>>>> .r812
+                               D31D4E6D09BEC3E1001112B8 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D346F17B09BF38BA00404918 /* Build configuration list for PBXNativeTarget "mod_echo.dylib" */ = {
+               D31D4E7D09BEC574001112B8 /* Build configuration list for PBXNativeTarget "libapr-util.dylib" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D31D4E7E09BEC574001112B8 /* Debug */,
-=======
-                               D346F17C09BF38BA00404918 /* Debug */,
-                               D346F17D09BF38BA00404918 /* Release */,
->>>>>>> .r812
+                               D31D4E7F09BEC574001112B8 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D3A7638109BEAAEE002E9B53 /* Build configuration list for PBXProject "freeswitch" */ = {
+               D31D500F09BEC8B9001112B8 /* Build configuration list for PBXNativeTarget "libapr-util.a" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D31D501009BEC8B9001112B8 /* Debug */,
-=======
-                               D3A7638209BEAAEE002E9B53 /* Debug */,
-                               D3A7638309BEAAEE002E9B53 /* Release */,
->>>>>>> .r812
+                               D31D501109BEC8B9001112B8 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D3A7641D09BEB306002E9B53 /* Build configuration list for PBXAggregateTarget "All" */ = {
+               D31D504609BECAAA001112B8 /* Build configuration list for PBXNativeTarget "libfreeswitch.dylib" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D31D504709BECAAA001112B8 /* Debug */,
-=======
-                               D3A7641E09BEB306002E9B53 /* Debug */,
-                               D3A7641F09BEB306002E9B53 /* Release */,
->>>>>>> .r812
+                               D31D504809BECAAA001112B8 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D3C7A72A09BF46C9009127A4 /* Build configuration list for PBXNativeTarget "mod_bridgecall.dylib" */ = {
+               D31D509409BECBCB001112B8 /* Build configuration list for PBXNativeTarget "freeswitch" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D31D509509BECBCB001112B8 /* Debug */,
-=======
-                               D3C7A72B09BF46C9009127A4 /* Debug */,
-                               D3C7A72C09BF46C9009127A4 /* Release */,
->>>>>>> .r812
+                               D31D509609BECBCB001112B8 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D3C7A7F809BF58E5009127A4 /* Build configuration list for PBXAggregateTarget "apr-1.2.2" */ = {
+               D3A7638109BEAAEE002E9B53 /* Build configuration list for PBXProject "freeswitch" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D3A7638209BEAAEE002E9B53 /* Debug */,
-=======
-                               D3C7A7F909BF58E5009127A4 /* Debug */,
-                               D3C7A7FA09BF58E5009127A4 /* Release */,
->>>>>>> .r812
+                               D3A7638309BEAAEE002E9B53 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D3C7A80809BF5B98009127A4 /* Build configuration list for PBXAggregateTarget "sqlite-3.2.8" */ = {
+               D3A7639509BEAB97002E9B53 /* Build configuration list for PBXNativeTarget "libresample.a" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D3A7639609BEAB97002E9B53 /* Debug */,
-=======
-                               D3C7A80909BF5B98009127A4 /* Debug */,
-                               D3C7A80A09BF5B98009127A4 /* Release */,
->>>>>>> .r812
+                               D3A7639709BEAB97002E9B53 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D3C7A84B09BF5FF9009127A4 /* Build configuration list for PBXAggregateTarget "apr-util-1.2.2" */ = {
+               D3A763FB09BEB216002E9B53 /* Build configuration list for PBXNativeTarget "libteletone.a" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D3A763FC09BEB216002E9B53 /* Debug */,
-=======
-                               D3C7A84C09BF5FF9009127A4 /* Debug */,
-                               D3C7A84D09BF5FF9009127A4 /* Release */,
->>>>>>> .r812
+                               D3A763FD09BEB216002E9B53 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D3C7A86C09BF60A5009127A4 /* Build configuration list for PBXAggregateTarget "resample-0.1.3" */ = {
+               D3A7641A09BEB306002E9B53 /* Build configuration list for PBXNativeTarget "libteletone.dylib" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D3A7641B09BEB306002E9B53 /* Debug */,
-=======
-                               D3C7A86D09BF60A5009127A4 /* Debug */,
-                               D3C7A86E09BF60A5009127A4 /* Release */,
->>>>>>> .r812
+                               D3A7641C09BEB306002E9B53 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-               D3C7A86F09BF60A5009127A4 /* Build configuration list for PBXAggregateTarget "teletone" */ = {
+               D3A7641D09BEB306002E9B53 /* Build configuration list for PBXAggregateTarget "All" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-<<<<<<< .mine
                                D3A7641E09BEB306002E9B53 /* Debug */,
-=======
-                               D3C7A87009BF60A5009127A4 /* Debug */,
-                               D3C7A87109BF60A5009127A4 /* Release */,
->>>>>>> .r812
+                               D3A7641F09BEB306002E9B53 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-<<<<<<< .mine
                D3A7643509BEB4A7002E9B53 /* Build configuration list for PBXNativeTarget "libsqlite3.dylib" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                D3A7643609BEB4A7002E9B53 /* Debug */,
+                               D3A7643709BEB4A7002E9B53 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
                D3A767B509BEBD34002E9B53 /* Build configuration list for PBXNativeTarget "libsqlite3.a" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                D3A767B609BEBD34002E9B53 /* Debug */,
+                               D3A767B709BEBD34002E9B53 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Debug;
+                       defaultConfigurationName = Release;
                };
-=======
->>>>>>> .r812
 /* End XCConfigurationList section */
        };
        rootObject = D3A7638009BEAAEE002E9B53 /* Project object */;