mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-13 07:45:26 +00:00
SCREW that conflict.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@814 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
456f3b2150
commit
ff0242e2c1
@ -199,13 +199,9 @@
|
||||
<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>
|
||||
@ -260,24 +256,15 @@
|
||||
<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>
|
||||
@ -300,7 +287,7 @@
|
||||
<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>
|
||||
@ -337,7 +324,7 @@
|
||||
<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>
|
||||
@ -357,7 +344,7 @@
|
||||
<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>
|
||||
@ -381,17 +368,9 @@
|
||||
</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>
|
||||
@ -530,7 +509,7 @@
|
||||
<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>
|
||||
@ -568,10 +547,12 @@
|
||||
<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>
|
||||
@ -609,11 +590,7 @@
|
||||
<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>
|
||||
@ -624,15 +601,11 @@
|
||||
<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>
|
||||
@ -655,8 +628,8 @@
|
||||
<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>
|
||||
@ -671,8 +644,8 @@
|
||||
<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>
|
||||
@ -694,18 +667,18 @@
|
||||
<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>
|
||||
@ -715,27 +688,22 @@
|
||||
<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>
|
||||
@ -841,18 +809,16 @@
|
||||
<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>
|
||||
@ -865,7 +831,7 @@
|
||||
<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>
|
||||
@ -874,7 +840,7 @@
|
||||
</dict>
|
||||
</array>
|
||||
<key>Proportion</key>
|
||||
<string>359pt</string>
|
||||
<string>358pt</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>Name</key>
|
||||
@ -884,19 +850,15 @@
|
||||
<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>
|
||||
@ -958,18 +920,18 @@
|
||||
<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>
|
||||
@ -983,22 +945,14 @@
|
||||
<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>
|
||||
@ -1090,18 +1044,18 @@
|
||||
<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>
|
||||
@ -1130,13 +1084,10 @@
|
||||
<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>
|
||||
@ -1146,7 +1097,7 @@
|
||||
<key>PBXTopSmartGroupGIDs</key>
|
||||
<array/>
|
||||
<key>XCIncludePerspectivesSwitch</key>
|
||||
<false/>
|
||||
<integer>0</integer>
|
||||
</dict>
|
||||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
@ -1158,7 +1109,7 @@
|
||||
<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>
|
||||
@ -1166,8 +1117,6 @@
|
||||
<string>185pt</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
@ -1180,7 +1129,7 @@
|
||||
<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>
|
||||
@ -1204,22 +1153,22 @@
|
||||
<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>
|
||||
|
@ -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 = (
|
||||
@ -81,37 +39,22 @@
|
||||
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 */;
|
||||
@ -119,35 +62,13 @@
|
||||
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,
|
||||
@ -174,7 +95,7 @@
|
||||
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
|
||||
PBXFileTableDataSourceColumnWidthsKey = (
|
||||
20,
|
||||
315,
|
||||
862,
|
||||
20,
|
||||
48,
|
||||
43,
|
||||
@ -196,53 +117,13 @@
|
||||
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;
|
||||
@ -265,13 +146,8 @@
|
||||
PBXFileDataSource_Warnings_ColumnID,
|
||||
);
|
||||
};
|
||||
<<<<<<< .mine
|
||||
PBXPerProjectTemplateStateSaveDate = 163541522;
|
||||
PBXWorkspaceStateSaveDate = 163541522;
|
||||
=======
|
||||
PBXPerProjectTemplateStateSaveDate = 163539282;
|
||||
PBXWorkspaceStateSaveDate = 163539282;
|
||||
>>>>>>> .r812
|
||||
PBXPerProjectTemplateStateSaveDate = 163499686;
|
||||
PBXWorkspaceStateSaveDate = 163499686;
|
||||
};
|
||||
sourceControlManager = D3A7638409BEAAEE002E9B53 /* Source Control */;
|
||||
userBuildSettings = {
|
||||
@ -292,39 +168,65 @@
|
||||
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 */,
|
||||
);
|
||||
};
|
||||
D3A763F209BEB1CF002E9B53 /* libteletone.a */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
D3A763FE09BEB271002E9B53 /* All */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
D3C7A71E09BF4674009127A4 /* mod_bridgecall.c */ = {
|
||||
D3A7640609BEB286002E9B53 /* libteletone.dylib */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
D3A7642E09BEB480002E9B53 /* libsqlite3.dylib */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
D3A7662C09BEB5EA002E9B53 /* build.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1332, 1414}}";
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1332, 41146}}";
|
||||
sepNavSelRange = "{0, 0}";
|
||||
sepNavVisRect = "{{0, 262}, {1332, 762}}";
|
||||
sepNavWindowFrame = "{{181, 123}, {1371, 891}}";
|
||||
sepNavVisRect = "{{0, 0}, {1332, 762}}";
|
||||
sepNavWindowFrame = "{{61, 90}, {1371, 891}}";
|
||||
};
|
||||
};
|
||||
D3C7A72209BF467F009127A4 /* mod_bridgecall.dylib */ = {
|
||||
activeExec = 0;
|
||||
D3A7665409BEB5EA002E9B53 /* tokenize.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1332, 6076}}";
|
||||
sepNavSelRange = "{9603, 37}";
|
||||
sepNavVisRect = "{{0, 4652}, {1332, 762}}";
|
||||
sepNavWindowFrame = "{{107, 48}, {1371, 891}}";
|
||||
};
|
||||
};
|
||||
D3C7A7EC09BF58D2009127A4 /* apr-1.2.2 */ = {
|
||||
activeExec = 0;
|
||||
D3A7673709BEBAFE002E9B53 /* build.c:29 */ = {
|
||||
isa = PBXFileBreakpoint;
|
||||
actions = (
|
||||
);
|
||||
continueAfterActions = 0;
|
||||
delayBeforeContinue = 0;
|
||||
fileReference = D3A7662C09BEB5EA002E9B53 /* build.c */;
|
||||
hitCount = 0;
|
||||
lineNumber = 29;
|
||||
modificationTime = 163494654.595558;
|
||||
state = 1;
|
||||
};
|
||||
D3C7A80209BF5B43009127A4 /* sqlite-3.2.8 */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
D3C7A84009BF5FC2009127A4 /* apr-util-1.2.2 */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
D3C7A85C09BF6066009127A4 /* resample-0.1.3 */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
D3C7A86109BF60A1009127A4 /* teletone */ = {
|
||||
D3A7676B09BEBCF7002E9B53 /* libsqlite3.a */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user