Adium.xcodeproj/project.pbxproj
author Evan Schoenberg
Wed, 05 Sep 2012 23:36:01 -0500
branchadium-1.5.4
changeset 5039 68bb3f77b1d0
parent 5032 f2c1839e0ee1
child 5048 445ac0a46029
permissions -rw-r--r--
Tab switching now defaults to ctrl+tab, matching Safari's user visible default, as per discussion on IRC today. This only applies to new users as of Adium 1.5.4 and later; anyone who has run a previous version will inherit the keep the old default of command+arrows (unless they've changed it previously, of course). Fixes #16102.
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
     1
// !$*UTF8*$!
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
     2
{
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
     3
	archiveVersion = 1;
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
     4
	classes = {
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
     5
	};
4021
f5412548f2f3 Resolved several dozen warnings
Evan Schoenberg
parents: 4019
diff changeset
     6
	objectVersion = 46;
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
     7
	objects = {
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
     8
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
     9
/* Begin PBXAggregateTarget section */
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    10
		34F3B9510BDF15F40011AB34 /* Touch Framework Bundles to Executable Date */ = {
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    11
			isa = PBXAggregateTarget;
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    12
			buildConfigurationList = 34F3B95A0BDF16130011AB34 /* Build configuration list for PBXAggregateTarget "Touch Framework Bundles to Executable Date" */;
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    13
			buildPhases = (
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    14
				34F3B9500BDF15F40011AB34 /* ShellScript */,
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    15
			);
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    16
			dependencies = (
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    17
			);
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    18
			name = "Touch Framework Bundles to Executable Date";
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    19
			productName = "Touch Framework Bundles to Executable Date";
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    20
		};
1887
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    21
		F53C25AE0A2F95F100F7B73D /* Setup Build Directory */ = {
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    22
			isa = PBXAggregateTarget;
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    23
			buildConfigurationList = F53C25AF0A2F95F600F7B73D /* Build configuration list for PBXAggregateTarget "Setup Build Directory" */;
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    24
			buildPhases = (
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    25
				F53C25AD0A2F95F100F7B73D /* ShellScript */,
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    26
			);
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    27
			dependencies = (
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    28
			);
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    29
			name = "Setup Build Directory";
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    30
			productName = "Setup Build Directory";
a2820d98573a Backed out changeset 1577b49aefea. Sadly, Xcode is horrible about cross-project references and offers no better solution than this ugly shell script. :(
David Smith <catfish.man@gmail.com>
parents: 1795
diff changeset
    31
		};
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    32
		F5B17CCF0A16C6AC004AE99E /* Plist Macros */ = {
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    33
			isa = PBXAggregateTarget;
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    34
			buildConfigurationList = F5B17CD70A16C6BA004AE99E /* Build configuration list for PBXAggregateTarget "Plist Macros" */;
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    35
			buildPhases = (
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    36
				F5B17CCE0A16C6AC004AE99E /* ShellScript */,
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    37
			);
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    38
			dependencies = (
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    39
			);
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    40
			name = "Plist Macros";
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    41
			productName = "Plist Macros";
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    42
		};
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    43
/* End PBXAggregateTarget section */
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    44
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    45
/* Begin PBXBuildFile section */
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    46
		071C56330827933100399C0F /* Shared Dock Icon Images in Resources */ = {isa = PBXBuildFile; fileRef = 071C56310827933000399C0F /* Shared Dock Icon Images */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    47
		073475F10C4C9632009ACC43 /* AdiumMenuBarIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 073475F00C4C9632009ACC43 /* AdiumMenuBarIcons.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    48
		074DDB5D07CB413F0033AFF7 /* CBContactLastSeenPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 074DDB5C07CB413F0033AFF7 /* CBContactLastSeenPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
    49
		07632BF30949E10B00FFABD8 /* ListThemeSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42B080870A200E27095 /* ListThemeSheet.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    50
		0779934F08221D9700F698DC /* Service Icons in Resources */ = {isa = PBXBuildFile; fileRef = 4BAFD5E806E00D1700FF7FBC /* Service Icons */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    51
		07C6EA890C06676400B79CBD /* AdiumHelp in Resources */ = {isa = PBXBuildFile; fileRef = 07C6EA3C0C06676400B79CBD /* AdiumHelp */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    52
		07E179780C657B5E005DDA3D /* ConfirmationDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 07E179770C657B5E005DDA3D /* ConfirmationDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    53
		0C27C8650C75A23F002AA363 /* NSStringScriptingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C27C8640C75A23A002AA363 /* NSStringScriptingAdditions.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    54
		0C79A2D90C5E633F005AE6FA /* AIMoveCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C79A2D70C5E633F005AE6FA /* AIMoveCommand.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    55
		0CAC6A140C0C657A0090AE95 /* Adium.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 0CAC6A130C0C657A0090AE95 /* Adium.sdef */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    56
		0CD3C3AD0C43C8CC003E637C /* NSWindowScriptingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD3C3AB0C43C8CC003E637C /* NSWindowScriptingAdditions.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    57
		0CD41C710C2776550082F83B /* AICreateCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD41C6F0C2776550082F83B /* AICreateCommand.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    58
		0CFA98C90D35C18000A077C6 /* NSDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFA98C70D35C18000A077C6 /* NSDataAdditions.m */; };
2795
74a33a2e7467 Add a "Default font remover" plugin. Refs #12906 (though really fixes it).
Zachary West <zacw@adium.im>
parents: 2721
diff changeset
    59
		11000D041098863B0096A1E2 /* AIDefaultFontRemovalPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11000D031098863B0096A1E2 /* AIDefaultFontRemovalPlugin.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    60
		110763F608676CC9005987A5 /* RAFBlockEditorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 110763F208676CC9005987A5 /* RAFBlockEditorPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    61
		110763F808676CC9005987A5 /* RAFBlockEditorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 110763F408676CC9005987A5 /* RAFBlockEditorWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
    62
		110763FA08676D05005987A5 /* BlockEditorWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 110763F908676D04005987A5 /* BlockEditorWindow.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
    63
		11077B6F0DE647C100A4DD25 /* AIStatusItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 11077B6E0DE647C100A4DD25 /* AIStatusItemView.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
    64
		1109634C0F61C1D00064CA0E /* AITwitterReplyWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1109634B0F61C1D00064CA0E /* AITwitterReplyWindow.nib */; };
877
f63a7672f1e0 Add a "Reply to Tweet" menu item, which allows one to enter the Username and Status ID of a Tweet to respond to. Optionally, a twitter.com/(username)/status/(statusid) URL can be posted, and it will parse out the necessary chunks.
Zachary West <zacw@adiumx.com>
parents: 850
diff changeset
    65
		1109661A0F61D3E70064CA0E /* AITwitterReplyWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 110966190F61D3E70064CA0E /* AITwitterReplyWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
    66
		1111B2300F8478500068CE51 /* Filter Bar.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1111B22F0F8478500068CE51 /* Filter Bar.nib */; };
1469
e712f0dd6f64 Add an AIFilterBarView, which draws a background if requested, and draws its background as a roudned rectangle if so desired. There's currently a weird glitch where the search field is drawing a black background over this pretty white field. Refs #10489.
Zachary West <zacw@adiumx.com>
parents: 1467
diff changeset
    67
		1111B2680F847CAD0068CE51 /* AIFilterBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1111B2670F847CAD0068CE51 /* AIFilterBarView.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
    68
		111256060F8DA2B200E76177 /* ESBonjourAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F4675B080F46AC007800AB /* ESBonjourAccountView.nib */; };
1625
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    69
		111256070F8DA2BF00E76177 /* AWEzv.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5D30655E90C00B791E5 /* AWEzv.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    70
		111256080F8DA2BF00E76177 /* AWEzvContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5D50655E90C00B791E5 /* AWEzvContact.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    71
		111256090F8DA2BF00E76177 /* AWEzvSupportRoutines.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5EF0655E90D00B791E5 /* AWEzvSupportRoutines.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    72
		1112560A0F8DA2BF00E76177 /* AWEzvContactManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F30655E90D00B791E5 /* AWEzvContactManager.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    73
		1112560B0F8DA2BF00E76177 /* AWEzvContactManagerListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F50655E90D00B791E5 /* AWEzvContactManagerListener.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    74
		1112560C0F8DA2BF00E76177 /* AWEzvContactManagerRendezvous.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F70655E90D00B791E5 /* AWEzvContactManagerRendezvous.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    75
		1112560D0F8DA2BF00E76177 /* AWEzvPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FB0655E90D00B791E5 /* AWEzvPrivate.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    76
		1112560E0F8DA2BF00E76177 /* AWEzvRendezvousData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FD0655E90D00B791E5 /* AWEzvRendezvousData.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    77
		1112560F0F8DA2BF00E76177 /* AWEzvStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FF0655E90D00B791E5 /* AWEzvStack.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    78
		111256100F8DA2BF00E76177 /* AWEzvXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6010655E90D00B791E5 /* AWEzvXMLNode.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    79
		111256110F8DA2BF00E76177 /* AWEzvXMLStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6030655E90D00B791E5 /* AWEzvXMLStream.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    80
		111256120F8DA2BF00E76177 /* ESBonjourAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46755080F46AB007800AB /* ESBonjourAccountViewController.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    81
		111256130F8DA2BF00E76177 /* AWBonjourPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46757080F46AB007800AB /* AWBonjourPlugin.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    82
		111256140F8DA2BF00E76177 /* AWBonjourAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46759080F46AB007800AB /* AWBonjourAccount.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    83
		111256150F8DA2BF00E76177 /* AWBonjourService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F4675C080F46AC007800AB /* AWBonjourService.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    84
		111256160F8DA2BF00E76177 /* EKEzvFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAFD7B20C4FD00100EDB3B8 /* EKEzvFileTransfer.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    85
		111256170F8DA2BF00E76177 /* AsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330970C7235AD00B001A8 /* AsyncSocket.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    86
		111256180F8DA2BF00E76177 /* HTTPAuthenticationRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330990C7235AD00B001A8 /* HTTPAuthenticationRequest.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    87
		111256190F8DA2BF00E76177 /* HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB3309B0C7235AD00B001A8 /* HTTPServer.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    88
		1112561A0F8DA2BF00E76177 /* EKEzvIncomingFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    89
		1112561B0F8DA2BF00E76177 /* EKEzvOutgoingFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    90
		111256200F8DA2DB00E76177 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6341AEFE0E53A09C00AE1439 /* libexpat.dylib */; };
e29b0199b55f Make Bonjour a CoreComponent. We we always load it anyway, and a separate target is just another level of complexity.
Zachary West <zacw@adiumx.com>
parents: 1620
diff changeset
    91
		111256210F8DA2DB00E76177 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 636C6E5D0ED56D0100E0E528 /* libcrypto.dylib */; };
1395
6eddc7deb5f3 Store flags and aliases for chats in the appropriate chats. Creates a new AIListContact cell for displaying in group chats, which prefixes the user with the character representing their status. As of yet, they aren't sorted by this order.
Zachary West <zacw@adiumx.com>
parents: 1373
diff changeset
    92
		111D58210F7FC1B900883487 /* AIListContactGroupChatCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 111D581F0F7FC1B900883487 /* AIListContactGroupChatCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
6eddc7deb5f3 Store flags and aliases for chats in the appropriate chats. Creates a new AIListContact cell for displaying in group chats, which prefixes the user with the character representing their status. As of yet, they aren't sorted by this order.
Zachary West <zacw@adiumx.com>
parents: 1373
diff changeset
    93
		111D58220F7FC1B900883487 /* AIListContactGroupChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 111D58200F7FC1B900883487 /* AIListContactGroupChatCell.m */; };
325
eb1f860a0ad6 Combine {{{ESAutoAwayPlugin}}} and {{{ESFastUserSwitchingSupportPlugin}}} (which also had screensaver support, too) into {{{AIAutomaticStatus}}}, allowing a central point to deal with automatic status changes. This has (very) basic support for dropping in an iChat-style "Welcome back! Do you want to become available or pretend like this never happened?" dialog. Refs #4880.
Zachary West <zacw@adiumx.com>
parents: 320
diff changeset
    94
		111DDF3A0E8E7D2F00114FCA /* AIAutomaticStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 111DDF390E8E7D2F00114FCA /* AIAutomaticStatus.m */; };
1740
f5e4bfc98331 Expose and display the attributes of PurpleConvChatBuddies I added in [26956], namely userhost and realname for IRC contacts. On join, we WHO the channel, and store userhosts and realnames for users. I need to add a timeout to the IRC protocol to WHO regularly to get status and real names for users who joined, but that can come later.
Zachary West <zacw@adiumx.com>
parents: 1675
diff changeset
    95
		111E89010F93FE3900A5F18B /* AIRealNameTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 111E88FE0F93FE3900A5F18B /* AIRealNameTooltip.m */; };
f5e4bfc98331 Expose and display the attributes of PurpleConvChatBuddies I added in [26956], namely userhost and realname for IRC contacts. On join, we WHO the channel, and store userhosts and realnames for users. I need to add a timeout to the IRC protocol to WHO regularly to get status and real names for users who joined, but that can come later.
Zachary West <zacw@adiumx.com>
parents: 1675
diff changeset
    96
		111E89020F93FE3900A5F18B /* AIUserHostTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 111E89000F93FE3900A5F18B /* AIUserHostTooltip.m */; };
1559
ada5a6eb0566 Project changes for [26770].
Zachary West <zacw@adiumx.com>
parents: 1554
diff changeset
    97
		1121B29A0F896A720047EC66 /* AIContactVisibilityControlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1121B2990F896A720047EC66 /* AIContactVisibilityControlPlugin.m */; };
847
03342db6450f Add {{{in_reply_to_status_id}}} tracking to the Twitter service.
Zachary West <zacw@adiumx.com>
parents: 815
diff changeset
    98
		112523190F5F7F86003FC58A /* AITwitterURLHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 112523180F5F7F86003FC58A /* AITwitterURLHandler.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
    99
		112939020FD5AC1B00FA8F53 /* AIConfirmationsAdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 112939010FD5AC1B00FA8F53 /* AIConfirmationsAdvancedPreferences.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   100
		112939100FD5AE1400FA8F53 /* AIConfirmationsAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 1129390F0FD5AE1400FA8F53 /* AIConfirmationsAdvancedPreferences.m */; };
1434
319c0c9d6f96 AIGroupChatStatusIcons should be flagged as public.
Zachary West <zacw@adiumx.com>
parents: 1433
diff changeset
   101
		112B47240F82DC2300690E84 /* AIGroupChatStatusIcons.h in Headers */ = {isa = PBXBuildFile; fileRef = 112B47220F82DC2300690E84 /* AIGroupChatStatusIcons.h */; settings = {ATTRIBUTES = (Public, ); }; };
1433
c97e4c2d3e7a Create a new Xtra?GroupChatStatusIcons?which is (at the moment, and possible for 1.4) uncustomizable. The default icon pack for this was stolen from Colloquy, so I named it appropriately "Colloquy". I hope somebody has a better idea to replace it, I just needed icons to use for testing. Moves AIXtraInfo into Adium.framework, and creates the AIGroupChatStatusIcons there. It uses a singleton (instead of instance methods like AIStatusIcons) to keep track of its icons.
Zachary West <zacw@adiumx.com>
parents: 1416
diff changeset
   102
		112B47250F82DC2300690E84 /* AIGroupChatStatusIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = 112B47230F82DC2300690E84 /* AIGroupChatStatusIcons.m */; };
c97e4c2d3e7a Create a new Xtra?GroupChatStatusIcons?which is (at the moment, and possible for 1.4) uncustomizable. The default icon pack for this was stolen from Colloquy, so I named it appropriately "Colloquy". I hope somebody has a better idea to replace it, I just needed icons to use for testing. Moves AIXtraInfo into Adium.framework, and creates the AIGroupChatStatusIcons there. It uses a singleton (instead of instance methods like AIStatusIcons) to keep track of its icons.
Zachary West <zacw@adiumx.com>
parents: 1416
diff changeset
   103
		112B47670F82E0FC00690E84 /* AIXtraInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 112B47650F82E0FC00690E84 /* AIXtraInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
c97e4c2d3e7a Create a new Xtra?GroupChatStatusIcons?which is (at the moment, and possible for 1.4) uncustomizable. The default icon pack for this was stolen from Colloquy, so I named it appropriately "Colloquy". I hope somebody has a better idea to replace it, I just needed icons to use for testing. Moves AIXtraInfo into Adium.framework, and creates the AIGroupChatStatusIcons there. It uses a singleton (instead of instance methods like AIStatusIcons) to keep track of its icons.
Zachary West <zacw@adiumx.com>
parents: 1416
diff changeset
   104
		112B47680F82E0FC00690E84 /* AIXtraInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 112B47660F82E0FC00690E84 /* AIXtraInfo.m */; };
c97e4c2d3e7a Create a new Xtra?GroupChatStatusIcons?which is (at the moment, and possible for 1.4) uncustomizable. The default icon pack for this was stolen from Colloquy, so I named it appropriately "Colloquy". I hope somebody has a better idea to replace it, I just needed icons to use for testing. Moves AIXtraInfo into Adium.framework, and creates the AIGroupChatStatusIcons there. It uses a singleton (instead of instance methods like AIStatusIcons) to keep track of its icons.
Zachary West <zacw@adiumx.com>
parents: 1416
diff changeset
   105
		112B483F0F82E91200690E84 /* Group Chat Status Icons in Resources */ = {isa = PBXBuildFile; fileRef = 112B483E0F82E91200690E84 /* Group Chat Status Icons */; };
1439
be1aa6fd5ee0 Add a tooltip plugin which displays the chats we have in common with a contact, their status in the chat, and their status icon in the chat.
Zachary West <zacw@adiumx.com>
parents: 1436
diff changeset
   106
		112B490A0F82FB1700690E84 /* AIGroupChatStatusTooltipPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 112B49090F82FB1700690E84 /* AIGroupChatStatusTooltipPlugin.m */; };
1445
91536ab2f14e Add an advanced preference pane "Mention" (which uses the status pane's icon, WTB ICON DESIGNERS) which allows the user to add arbitrary text to the list which trigger a "mention".
Zachary West <zacw@adiumx.com>
parents: 1439
diff changeset
   107
		112B4A250F83194700690E84 /* AIMentionAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 112B4A240F83194700690E84 /* AIMentionAdvancedPreferences.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   108
		112B4A3E0F831A4400690E84 /* AIMentionAdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 112B4A3D0F831A4400690E84 /* AIMentionAdvancedPreferences.nib */; };
2277
150e268bff74 Format our action links into an overall classed span, and class the left and right parenthesis so they can be easily hidden/removed. Refs #12049.
Zachary West <zacw@adium.im>
parents: 2195
diff changeset
   109
		112E7FA60FC86BB400657119 /* AITwitterActionsHTMLFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 112E7FA50FC86BB400657119 /* AITwitterActionsHTMLFilter.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   110
		1130EA99109B445500FB3454 /* pref-defaultclient.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA98109B445500FB3454 /* pref-defaultclient.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   111
		1130EA9D109B445D00FB3454 /* pref-mention.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9B109B445D00FB3454 /* pref-mention.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   112
		1130EA9E109B445D00FB3454 /* pref-messagealerts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9C109B445D00FB3454 /* pref-messagealerts.tiff */; };
1033
a935eb578632 Add a [http://laconi.ca/trac/ Laconica] service. Laconica is an API-compatible (with Twitter), open-source microblogging server. The most popular Laconica server is [http://identi.ca Identi.ca].
Zachary West <zacw@adiumx.com>
parents: 1000
diff changeset
   113
		113891830F6B6AFF00A7D7DC /* AILaconicaService.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891820F6B6AFF00A7D7DC /* AILaconicaService.m */; };
a935eb578632 Add a [http://laconi.ca/trac/ Laconica] service. Laconica is an API-compatible (with Twitter), open-source microblogging server. The most popular Laconica server is [http://identi.ca Identi.ca].
Zachary West <zacw@adiumx.com>
parents: 1000
diff changeset
   114
		1138918A0F6B6B2800A7D7DC /* AILaconicaAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891890F6B6B2800A7D7DC /* AILaconicaAccount.m */; };
a935eb578632 Add a [http://laconi.ca/trac/ Laconica] service. Laconica is an API-compatible (with Twitter), open-source microblogging server. The most popular Laconica server is [http://identi.ca Identi.ca].
Zachary West <zacw@adiumx.com>
parents: 1000
diff changeset
   115
		1138918D0F6B6B3F00A7D7DC /* AILaconicaPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1138918C0F6B6B3F00A7D7DC /* AILaconicaPlugin.m */; };
a935eb578632 Add a [http://laconi.ca/trac/ Laconica] service. Laconica is an API-compatible (with Twitter), open-source microblogging server. The most popular Laconica server is [http://identi.ca Identi.ca].
Zachary West <zacw@adiumx.com>
parents: 1000
diff changeset
   116
		113891950F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891940F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m */; };
a935eb578632 Add a [http://laconi.ca/trac/ Laconica] service. Laconica is an API-compatible (with Twitter), open-source microblogging server. The most popular Laconica server is [http://identi.ca Identi.ca].
Zachary West <zacw@adiumx.com>
parents: 1000
diff changeset
   117
		113892270F6B70CA00A7D7DC /* laconica-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 113892250F6B70CA00A7D7DC /* laconica-small.png */; };
a935eb578632 Add a [http://laconi.ca/trac/ Laconica] service. Laconica is an API-compatible (with Twitter), open-source microblogging server. The most popular Laconica server is [http://identi.ca Identi.ca].
Zachary West <zacw@adiumx.com>
parents: 1000
diff changeset
   118
		113892280F6B70CA00A7D7DC /* laconica.png in Resources */ = {isa = PBXBuildFile; fileRef = 113892260F6B70CA00A7D7DC /* laconica.png */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   119
		113900B10F85BEF60081A418 /* AIURLHandlerPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 113900B00F85BEF60081A418 /* AIURLHandlerPreferences.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   120
		113900B40F85BF880081A418 /* AIURLHandlerAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 113900B30F85BF880081A418 /* AIURLHandlerAdvancedPreferences.m */; };
1492
076adb934a85 Change AdiumURLHandling into an AIPlugin subclass, which allows us to create an advanced preference pane to control its actions. Adds a few useful features:
Zachary West <zacw@adiumx.com>
parents: 1480
diff changeset
   121
		1139011C0F85C9450081A418 /* AIURLHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1139011B0F85C9450081A418 /* AIURLHandlerPlugin.m */; };
1480
a77c4bc39567 Add an IRC channel linker (for use in display only) which links #global and &local channels following RFC1459.
Zachary West <zacw@adiumx.com>
parents: 1469
diff changeset
   122
		1139FFAA0F85260E0081A418 /* AIIRCChannelLinker.m in Sources */ = {isa = PBXBuildFile; fileRef = 1139FFA90F85260E0081A418 /* AIIRCChannelLinker.m */; };
815
953b742f0394 Rename {{{AITwitterURLParse}}} to the much more appropriate {{{AITwitterURLParser}}}.
Zachary West <zacw@adiumx.com>
parents: 814
diff changeset
   123
		113F26A00F5CC03F00954772 /* AITwitterURLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 113F269F0F5CC03F00954772 /* AITwitterURLParser.m */; };
1257
5073dd49befd Instead of creating a window for every authorization requests, create a central "Authorization Requests" window. This has a few toolbar items: Authorize, Authorize & Add, and Deny. Their icons are currently the SSL image, because I suck at art and I needed a placeholder. Another commit is going to add get info buttons, deny and block, and a few other things.
Zachary West <zacw@adiumx.com>
parents: 1256
diff changeset
   124
		114849B90F7841C600EA5264 /* AIAuthorizationRequestsWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 114849B70F7841C600EA5264 /* AIAuthorizationRequestsWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
5073dd49befd Instead of creating a window for every authorization requests, create a central "Authorization Requests" window. This has a few toolbar items: Authorize, Authorize & Add, and Deny. Their icons are currently the SSL image, because I suck at art and I needed a placeholder. Another commit is going to add get info buttons, deny and block, and a few other things.
Zachary West <zacw@adiumx.com>
parents: 1256
diff changeset
   125
		114849BA0F7841C600EA5264 /* AIAuthorizationRequestsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 114849B80F7841C600EA5264 /* AIAuthorizationRequestsWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   126
		114849BC0F78420300EA5264 /* AIAuthorizationRequestsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 114849BB0F78420300EA5264 /* AIAuthorizationRequestsWindow.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   127
		1150A9960FBE48D600E0BD31 /* ESIRCAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1150A9950FBE48D600E0BD31 /* ESIRCAccountView.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   128
		1154F50A12E1476900B8CA27 /* AILogByAccountWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1154F50712E1476900B8CA27 /* AILogByAccountWindow.nib */; };
3617
473739676f24 Add "Log only certain accounts", which lets you log only certain accounts, and add "Log secure chats" which (enabled by default) logs secure chats.
Zachary West <zacw@adium.im>
parents: 3615
diff changeset
   129
		1154F50B12E1476900B8CA27 /* AILogByAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1154F50912E1476900B8CA27 /* AILogByAccountWindowController.m */; };
1055
190ff672b6dc Add a basic URL shortener plugin. Adds an "Edit" and contextual (in the Text View) menu item which says "Replace with Shortened URL". Performs a synchronous request to TinyURL to get the TinyURL version of the selected link. Works on attributed links as well as text which the lexer finds to be a valid link.
Zachary West <zacw@adiumx.com>
parents: 1033
diff changeset
   130
		1163F0EC0F6C7A8300F12F5D /* AIURLShortenerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1163F0EB0F6C7A8300F12F5D /* AIURLShortenerPlugin.m */; };
1292
761b05dfd208 Add a Topic template for message styles, which gets added into a <div> with id "topic" in group chats. Authors should do something like: <div contentEditable>%message%</div> (or span, or whatever) so that (in a future commit) topics can be edited. The substitutions are the same for AIContentMessages. %sender% could be nil, however, on initial join.
Zachary West <zacw@adiumx.com>
parents: 1269
diff changeset
   131
		1164A90D0F7AD4AB00110AE4 /* AIContentTopic.h in Headers */ = {isa = PBXBuildFile; fileRef = 1164A90B0F7AD4AB00110AE4 /* AIContentTopic.h */; settings = {ATTRIBUTES = (Public, ); }; };
761b05dfd208 Add a Topic template for message styles, which gets added into a <div> with id "topic" in group chats. Authors should do something like: <div contentEditable>%message%</div> (or span, or whatever) so that (in a future commit) topics can be edited. The substitutions are the same for AIContentMessages. %sender% could be nil, however, on initial join.
Zachary West <zacw@adiumx.com>
parents: 1269
diff changeset
   132
		1164A9270F7AD70700110AE4 /* AIContentTopic.m in Sources */ = {isa = PBXBuildFile; fileRef = 1164A90C0F7AD4AB00110AE4 /* AIContentTopic.m */; };
2910
edc8d43a5784 Swap Growl-WI.framework with Growl.framework, saving a few meg off the download.
Zachary West <zacw@adium.im>
parents: 2908
diff changeset
   133
		116E369A10B72934002EDB0F /* Growl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9A8CB2104DEBC400F210CC /* Growl.framework */; };
edc8d43a5784 Swap Growl-WI.framework with Growl.framework, saving a few meg off the download.
Zachary West <zacw@adium.im>
parents: 2908
diff changeset
   134
		116E373310B729E9002EDB0F /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9A8CB2104DEBC400F210CC /* Growl.framework */; };
1373
f13700915250 Add a new type of saved password?"special" passwords. Can be used for pretty much anything, but the only use of it now is the following.
Zachary West <zacw@adiumx.com>
parents: 1370
diff changeset
   135
		117009A70F7E7D720078D6AB /* AIIRCServicesPasswordPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 117009A10F7E7D3A0078D6AB /* AIIRCServicesPasswordPlugin.m */; };
f13700915250 Add a new type of saved password?"special" passwords. Can be used for pretty much anything, but the only use of it now is the following.
Zachary West <zacw@adiumx.com>
parents: 1370
diff changeset
   136
		11700A350F7E8BE80078D6AB /* AISpecialPasswordPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11700A340F7E8BE80078D6AB /* AISpecialPasswordPromptController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   137
		11700A440F7E8CB60078D6AB /* AISpecialPasswordPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11700A430F7E8CB60078D6AB /* AISpecialPasswordPrompt.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   138
		1172FBCB0CDAA8D400B8E233 /* libglib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC30CDAA8D400B8E233 /* libglib.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   139
		1172FBCC0CDAA8D400B8E233 /* libgmodule.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC40CDAA8D400B8E233 /* libgmodule.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   140
		1172FBCD0CDAA8D400B8E233 /* libgobject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC50CDAA8D400B8E233 /* libgobject.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   141
		1172FBCE0CDAA8D400B8E233 /* libgthread.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC60CDAA8D400B8E233 /* libgthread.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   142
		1172FBCF0CDAA8D400B8E233 /* libintl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC70CDAA8D400B8E233 /* libintl.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   143
		1172FBD00CDAA8D400B8E233 /* libmeanwhile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC80CDAA8D400B8E233 /* libmeanwhile.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   144
		1172FBD10CDAA8D400B8E233 /* libpurple.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC90CDAA8D400B8E233 /* libpurple.framework */; };
528
d1e67712d005 Patch from '''tarragon''' to hide the "stop" button on a successful transfer, and replace it with a "resend" button on an outgoing unsuccessful transfer. Fixes #9446. Thanks!
Zachary West <zacw@adiumx.com>
parents: 527
diff changeset
   145
		117866DE0EC759B9003E9B97 /* FTProgressResend_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866D80EC759B9003E9B97 /* FTProgressResend_Selected.tif */; };
d1e67712d005 Patch from '''tarragon''' to hide the "stop" button on a successful transfer, and replace it with a "resend" button on an outgoing unsuccessful transfer. Fixes #9446. Thanks!
Zachary West <zacw@adiumx.com>
parents: 527
diff changeset
   146
		117866DF0EC759B9003E9B97 /* FTProgressResend.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866D90EC759B9003E9B97 /* FTProgressResend.tif */; };
d1e67712d005 Patch from '''tarragon''' to hide the "stop" button on a successful transfer, and replace it with a "resend" button on an outgoing unsuccessful transfer. Fixes #9446. Thanks!
Zachary West <zacw@adiumx.com>
parents: 527
diff changeset
   147
		117866E00EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DA0EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif */; };
d1e67712d005 Patch from '''tarragon''' to hide the "stop" button on a successful transfer, and replace it with a "resend" button on an outgoing unsuccessful transfer. Fixes #9446. Thanks!
Zachary West <zacw@adiumx.com>
parents: 527
diff changeset
   148
		117866E10EC759B9003E9B97 /* FTProgressResendPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */; };
d1e67712d005 Patch from '''tarragon''' to hide the "stop" button on a successful transfer, and replace it with a "resend" button on an outgoing unsuccessful transfer. Fixes #9446. Thanks!
Zachary West <zacw@adiumx.com>
parents: 527
diff changeset
   149
		117866E20EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */; };
d1e67712d005 Patch from '''tarragon''' to hide the "stop" button on a successful transfer, and replace it with a "resend" button on an outgoing unsuccessful transfer. Fixes #9446. Thanks!
Zachary West <zacw@adiumx.com>
parents: 527
diff changeset
   150
		117866E30EC759B9003E9B97 /* FTProgressResendRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   151
		117D6DC00BC5F0C40080D02B /* msg-request-attention.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 117D6DBF0BC5F0C40080D02B /* msg-request-attention.tiff */; };
3038
f599fa0d98d5 Create an `AIMedia` class, which will act as a media object. Create `AIMediaController`, which will moderate `AIMedia`s.
Zachary West <zacw@adium.im>
parents: 3036
diff changeset
   152
		11819A1B10D0B95D003E8ECA /* AIMediaControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 11819A0910D0B90E003E8ECA /* AIMediaControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
1132
15a2b97c582b (Required) OAuth support for Twitter. Added OAuthConsumer.framework as our OAuth provider. Modified MGTwitterEngine to handle OAuth, a very minor change really.
Zachary West <zacw@adiumx.com>
parents: 1113
diff changeset
   153
		11879C0B0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 11879C0A0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m */; };
15a2b97c582b (Required) OAuth support for Twitter. Added OAuthConsumer.framework as our OAuth provider. Modified MGTwitterEngine to handle OAuth, a very minor change really.
Zachary West <zacw@adiumx.com>
parents: 1113
diff changeset
   154
		11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
1793
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   155
		11879E0A0F6FFC1000CACFB1 /* OAuthConsumer.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
3787
d2e2842de122 Backout the libjson changes in the previous commit.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 3786
diff changeset
   156
		118A44500FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
d2e2842de122 Backout the libjson changes in the previous commit.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 3786
diff changeset
   157
		118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
d2e2842de122 Backout the libjson changes in the previous commit.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 3786
diff changeset
   158
		118A44540FEEA82E008153C0 /* libjson-glib.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
2429
4211a3be19a2 Create a new plugin - AIAnnoyingIRCMessagesHiderPlugin - which hides, well, annoying messages.
Zachary West <zacw@adium.im>
parents: 2389
diff changeset
   159
		1192E6D90FD3056F003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1192E6B10FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h */; };
4211a3be19a2 Create a new plugin - AIAnnoyingIRCMessagesHiderPlugin - which hides, well, annoying messages.
Zachary West <zacw@adium.im>
parents: 2389
diff changeset
   160
		1192E6DA0FD30578003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1192E6B20FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m */; };
2389
9b5721fa5865 Using an unpublished (but provided by pic.im) API, provide the pic.im server with information about tweets we send.
Zachary West <zacw@adium.im>
parents: 2372
diff changeset
   161
		1197F6710FCF8D180032F19B /* AITwitterStatusFollowup.m in Sources */ = {isa = PBXBuildFile; fileRef = 1197F6700FCF8D180032F19B /* AITwitterStatusFollowup.m */; };
2970
e8bcc642a927 Replace the (Authorize/Deny/Ignore).png images with (Authorize/Deny/Ignore).tiff images, with multiple sizes. From George Lambrou.
Zachary West <zacw@adium.im>
parents: 2911
diff changeset
   162
		1199AB0610BE13E600646322 /* Authorize.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1199AB0310BE13E600646322 /* Authorize.tiff */; };
e8bcc642a927 Replace the (Authorize/Deny/Ignore).png images with (Authorize/Deny/Ignore).tiff images, with multiple sizes. From George Lambrou.
Zachary West <zacw@adium.im>
parents: 2911
diff changeset
   163
		1199AB0710BE13E600646322 /* Deny.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1199AB0410BE13E600646322 /* Deny.tiff */; };
e8bcc642a927 Replace the (Authorize/Deny/Ignore).png images with (Authorize/Deny/Ignore).tiff images, with multiple sizes. From George Lambrou.
Zachary West <zacw@adium.im>
parents: 2911
diff changeset
   164
		1199AB0810BE13E600646322 /* Ignore.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1199AB0510BE13E600646322 /* Ignore.tiff */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   165
		11A2F10A0FC8FC1A00C3F05C /* AIMessageAlertsAdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11A2F1090FC8FC1A00C3F05C /* AIMessageAlertsAdvancedPreferences.nib */; };
2295
feae24a10fb6 Move the Status Menu Item and Dock Controller options from "Status" to "Message Alerts" advanced preference pane.
Zachary West <zacw@adium.im>
parents: 2277
diff changeset
   166
		11A2F1220FC8FC9D00C3F05C /* AIMessageAlertsAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 11A2F1210FC8FC9D00C3F05C /* AIMessageAlertsAdvancedPreferences.m */; };
2352
c36fe87b1679 Create an abstract CFNetwork uploader to provide progress information to the image uploader plugin.
Zachary West <zacw@adium.im>
parents: 2344
diff changeset
   167
		11AA10130FCE0969003908B6 /* AIProgressDataUploader.h in Headers */ = {isa = PBXBuildFile; fileRef = 11AA10110FCE0969003908B6 /* AIProgressDataUploader.h */; settings = {ATTRIBUTES = (Public, ); }; };
c36fe87b1679 Create an abstract CFNetwork uploader to provide progress information to the image uploader plugin.
Zachary West <zacw@adium.im>
parents: 2344
diff changeset
   168
		11AA10140FCE0969003908B6 /* AIProgressDataUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11AA10120FCE0969003908B6 /* AIProgressDataUploader.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   169
		11AA1EFA0BCAE9C3003DDA66 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11AA1EF90BCAE9C3003DDA66 /* Quartz.framework */; };
1000
a6fd3ee7e1c7 Generalize the "use SSL" and "use proxy server" settings into AIPurpleOscarAccountViewController, a superclass of now *Purple[AIM|ICQ]AccountViewController. Huge. Changeset.
Zachary West <zacw@adiumx.com>
parents: 949
diff changeset
   170
		11AE53610F68CE3300BE8077 /* AIPurpleOscarAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 11AE52000F68CA5000BE8077 /* AIPurpleOscarAccountViewController.h */; };
a6fd3ee7e1c7 Generalize the "use SSL" and "use proxy server" settings into AIPurpleOscarAccountViewController, a superclass of now *Purple[AIM|ICQ]AccountViewController. Huge. Changeset.
Zachary West <zacw@adiumx.com>
parents: 949
diff changeset
   171
		11AE53620F68CE3300BE8077 /* AIPurpleOscarAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11AE52010F68CA5000BE8077 /* AIPurpleOscarAccountViewController.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   172
		11AE5555109CC88C0074BDC2 /* pref-confirmations.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 11AE5554109CC88C0074BDC2 /* pref-confirmations.tiff */; };
2839
ecb36859abb9 Add a small IRC icon and an improved larger one. Refs #12697.
Zachary West <zacw@adium.im>
parents: 2837
diff changeset
   173
		11AE5587109CCCC30074BDC2 /* irc-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11AE5575109CCC950074BDC2 /* irc-small.png */; };
776
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   174
		11BD73D30F5A54BB007D438A /* twitter-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D10F5A54BB007D438A /* twitter-small.png */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   175
		11BD73D40F5A54BB007D438A /* twitter.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D20F5A54BB007D438A /* twitter.png */; };
2344
b5f68ee73ac3 An image uploader plugin. Found in the same locations as "Replace with Shortened URL."
Zachary West <zacw@adium.im>
parents: 2304
diff changeset
   176
		11BE28DF0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11BE28DE0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   177
		11BE29640FCCA8DA000E6A10 /* ImageUploaderProgress.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11BE29630FCCA8DA000E6A10 /* ImageUploaderProgress.nib */; };
2344
b5f68ee73ac3 An image uploader plugin. Found in the same locations as "Replace with Shortened URL."
Zachary West <zacw@adium.im>
parents: 2304
diff changeset
   178
		11BE29680FCCA9E3000E6A10 /* AIImageUploaderWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11BE29670FCCA9E3000E6A10 /* AIImageUploaderWindowController.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   179
		11C7CAF30BB58F4100296D7F /* AINudgeBuzzHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C7CAF10BB58F4100296D7F /* AINudgeBuzzHandlerPlugin.m */; };
1332
6229e9d2add1 Stupid XCode setting the wrong path.
Zachary West <zacw@adiumx.com>
parents: 1329
diff changeset
   180
		11C97DFD0F7D26C200E8DD37 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 11C97DFC0F7D26C200E8DD37 /* dsa_pub.pem */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   181
		11CA00100C35EC5100A6BB8D /* SS_PreferencePaneProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 344836910BC8510B0083723B /* SS_PreferencePaneProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   182
		11CA00110C35EC5200A6BB8D /* SS_PrefsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 344836920BC8510B0083723B /* SS_PrefsController.h */; settings = {ATTRIBUTES = (Public, ); }; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   183
		11CA00120C35EC5200A6BB8D /* SS_PrefsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344836900BC8510B0083723B /* SS_PrefsController.m */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   184
		11D135D90FBE4C65000B0A5E /* AITwitterAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11D135D80FBE4C65000B0A5E /* AITwitterAccountView.nib */; };
2534
1306b41fd66b Abstract multipart image uploading a bit and add an imageshack.us service for image uploading.
Zachary West <zacw@adium.im>
parents: 2530
diff changeset
   185
		11D9156F0FFC0FEB00B39713 /* AIImageShackImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11D915580FFC0E9C00B39713 /* AIImageShackImageUploader.m */; };
1306b41fd66b Abstract multipart image uploading a bit and add an imageshack.us service for image uploading.
Zachary West <zacw@adium.im>
parents: 2530
diff changeset
   186
		11D915720FFC100700B39713 /* AIGenericMultipartImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11D915710FFC100700B39713 /* AIGenericMultipartImageUploader.m */; };
1543
99d18b12a90c Add a new Main Menu item "Display" (we could potentially rename this; I can't really think of a better term, but it's almost too similar to View). Moves the "Toggle User List" menu item into it, and adds "Jump to (Previous, Next, Focus) Mark" and "Add Mark". Add Mark inserts a green mark.
Zachary West <zacw@adiumx.com>
parents: 1517
diff changeset
   187
		11E786810F8860210014612E /* AIJumpControlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11E7867F0F8860210014612E /* AIJumpControlPlugin.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   188
		11EE1B4D0CDCFAF40097F246 /* oscar-adium.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B490CDCFAF40097F246 /* oscar-adium.c */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   189
		11EE1B4E0CDCFAF40097F246 /* oscar-adium.h in Headers */ = {isa = PBXBuildFile; fileRef = 11EE1B4A0CDCFAF40097F246 /* oscar-adium.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   190
		11EE1B4F0CDCFAF40097F246 /* ssl-openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B4B0CDCFAF40097F246 /* ssl-openssl.c */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   191
		11EE1B500CDCFAF40097F246 /* ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B4C0CDCFAF40097F246 /* ssl.c */; };
1793
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   192
		11EE1CCF0CDD01120097F246 /* libglib.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC30CDAA8D400B8E233 /* libglib.framework */; };
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   193
		11EE1CD00CDD01120097F246 /* libgmodule.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC40CDAA8D400B8E233 /* libgmodule.framework */; };
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   194
		11EE1CD10CDD01120097F246 /* libgobject.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC50CDAA8D400B8E233 /* libgobject.framework */; };
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   195
		11EE1CD20CDD01120097F246 /* libgthread.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC60CDAA8D400B8E233 /* libgthread.framework */; };
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   196
		11EE1CD30CDD01120097F246 /* libintl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC70CDAA8D400B8E233 /* libintl.framework */; };
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   197
		11EE1CD40CDD01120097F246 /* libmeanwhile.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC80CDAA8D400B8E233 /* libmeanwhile.framework */; };
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   198
		11EE1CD50CDD01120097F246 /* libpurple.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC90CDAA8D400B8E233 /* libpurple.framework */; };
666
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   199
		11F145F00B546AC500CA91F6 /* Menu Bar Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 11F145C70B546A6D00CA91F6 /* Menu Bar Icons */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   200
		11F1460C0B546C1200CA91F6 /* AIMenuBarIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F1460A0B546C1200CA91F6 /* AIMenuBarIcons.m */; };
776
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   201
		11F738F20F58D12200B3285B /* AITwitterAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738F10F58D12200B3285B /* AITwitterAccount.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   202
		11F738F90F58D18700B3285B /* AITwitterService.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738F80F58D18700B3285B /* AITwitterService.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   203
		11F738FC0F58D19B00B3285B /* AITwitterPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738FB0F58D19B00B3285B /* AITwitterPlugin.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   204
		11F739020F58D1C400B3285B /* AITwitterAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739010F58D1C400B3285B /* AITwitterAccountViewController.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   205
		11F7397A0F58D4DC00B3285B /* MGTwitterEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7395B0F58D4DC00B3285B /* MGTwitterEngine.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   206
		11F7397B0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7395F0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   207
		11F7397E0F58D4DD00B3285B /* MGTwitterMessagesParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739650F58D4DC00B3285B /* MGTwitterMessagesParser.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   208
		11F739800F58D4DD00B3285B /* MGTwitterMiscParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739690F58D4DC00B3285B /* MGTwitterMiscParser.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   209
		11F739820F58D4DD00B3285B /* MGTwitterStatusesParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7396F0F58D4DC00B3285B /* MGTwitterStatusesParser.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   210
		11F739840F58D4DD00B3285B /* MGTwitterUsersParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739730F58D4DC00B3285B /* MGTwitterUsersParser.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   211
		11F739850F58D4DD00B3285B /* MGTwitterXMLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739750F58D4DC00B3285B /* MGTwitterXMLParser.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   212
		11F739860F58D4DD00B3285B /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739770F58D4DC00B3285B /* NSData+Base64.m */; };
243d6da010b2 Add a not-finished-at-all Twitter service plugin using [http://mattgemmell.com/ Matt Gemmel]'s MGTwitterEngine.
Zachary West <zacw@adiumx.com>
parents: 765
diff changeset
   213
		11F739870F58D4DD00B3285B /* NSString+UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739790F58D4DC00B3285B /* NSString+UUID.m */; };
1226
83a767c75be7 Revert [25511], [25538], [25539] which removed AIXMLElement. This breaks our ability to log elements the way we want (notably, > as &gt; to avoid problems with LMX's reverse-parsing). This is still broken, though: [25499]'s use of NSXMLElement causes the changes to encoding we've made in AIXMLElement to be reverted.
Zachary West <zacw@adiumx.com>
parents: 1153
diff changeset
   214
		11FC23C20F768C1600C1C906 /* AIXMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 11FC23BF0F768C0900C1C906 /* AIXMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
83a767c75be7 Revert [25511], [25538], [25539] which removed AIXMLElement. This breaks our ability to log elements the way we want (notably, > as &gt; to avoid problems with LMX's reverse-parsing). This is still broken, though: [25499]'s use of NSXMLElement causes the changes to encoding we've made in AIXMLElement to be reverted.
Zachary West <zacw@adiumx.com>
parents: 1153
diff changeset
   215
		11FC23C30F768C2900C1C906 /* AIXMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 11FC23C00F768C0900C1C906 /* AIXMLElement.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   216
		31034EFF0C8142680003F5AA /* TestStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31034EFE0C8142680003F5AA /* TestStringAdditions.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   217
		31034F0C0C8142720003F5AA /* UTF8Snowman.txt in Resources */ = {isa = PBXBuildFile; fileRef = 31034F0B0C8142720003F5AA /* UTF8Snowman.txt */; };
1072
0746249e89a5 Project changes for r26122, r26124, and r26125. (Oops.)
Peter Hosey
parents: 1055
diff changeset
   218
		3107D5250F63134F0051DDD5 /* TestAttributedStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3107D5240F63134F0051DDD5 /* TestAttributedStringAdditions.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   219
		312ED3D30C7E876E00A6BDA9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   220
		312ED3D50C7E878300A6BDA9 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 312ED3D40C7E878300A6BDA9 /* SenTestingKit.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   221
		312ED3E20C7E8A0700A6BDA9 /* TestDateFormatterStringRepWithInterval.m in Sources */ = {isa = PBXBuildFile; fileRef = 312ED3E10C7E8A0700A6BDA9 /* TestDateFormatterStringRepWithInterval.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   222
		313C2F940D4B19B50032334D /* TestDictionaryAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 313C2F930D4B19B50032334D /* TestDictionaryAdditions.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   223
		31455C9A0CC353F800D231A0 /* TestDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31455C990CC353F800D231A0 /* TestDataAdditions.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   224
		317D83680E89F40500298BDB /* msg-bookmark-chat.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 317D83670E89F40500298BDB /* msg-bookmark-chat.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   225
		318EA69C0D7A659900EDB105 /* TestColorAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 318EA69B0D7A659900EDB105 /* TestColorAdditions.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   226
		319B29800CE8EC6F00C65398 /* TestDateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 319B297F0CE8EC6E00C65398 /* TestDateAdditions.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   227
		31A764B90DA572B8000AC729 /* AutoHyperlinks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496A8EA07CE6CA30055BBAB /* AutoHyperlinks.framework */; };
3598
26c935192629 Move the scandate function (this version of it, at least) into a separate pair of files and make a test case for it*. Currently, all 7 tests fail.
Peter Hosey <hg@boredzo.org>
parents: 3597
diff changeset
   228
		31DDDA7112BDD5CE0048F6C0 /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
26c935192629 Move the scandate function (this version of it, at least) into a separate pair of files and make a test case for it*. Currently, all 7 tests fail.
Peter Hosey <hg@boredzo.org>
parents: 3597
diff changeset
   229
		31DDDA7A12BDD6E90048F6C0 /* TestScandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA7912BDD6E90048F6C0 /* TestScandate.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   230
		31E0CD810C5EEF5200271DB1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31E0CD800C5EEF5200271DB1 /* CoreAudio.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   231
		31FA804C0D4A8EB200ABE634 /* Adium.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 0CAC6A130C0C657A0090AE95 /* Adium.sdef */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   232
		3402D5A5080DBC91004E50B4 /* SortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E791D07CAA52300350507 /* SortConfiguration.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   233
		3402E01B07CB0CED0044F818 /* ESFileTransferProgressView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E01A07CB0CEC0044F818 /* ESFileTransferProgressView.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   234
		3402E02407CB0D1B0044F818 /* ProxyPasswordPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E02307CB0D1B0044F818 /* ProxyPasswordPrompt.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   235
		3402E02607CB0D1B0044F818 /* PasswordPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E02507CB0D1B0044F818 /* PasswordPrompt.nib */; };
4104
fef580659bb5 Switched About Dialog to xib.
Adrian Godoroja <robotive@me.com>
parents: 4101
diff changeset
   236
		3402E02E07CB0DBB0044F818 /* AboutBox.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E02D07CB0DBB0044F818 /* AboutBox.xib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   237
		3402E04207CB0E4D0044F818 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3402E04107CB0E4D0044F818 /* Localizable.strings */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   238
		3403F4D60D2EFE53006B08FB /* AICachedUserIconSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3403F4D40D2EFE53006B08FB /* AICachedUserIconSource.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   239
		3403F4D70D2EFE53006B08FB /* AICachedUserIconSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3403F4D50D2EFE53006B08FB /* AICachedUserIconSource.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   240
		3403F4D80D2EFE5B006B08FB /* AIManuallySetUserIconSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3403F4CF0D2EFE10006B08FB /* AIManuallySetUserIconSource.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   241
		3403F4DB0D2EFE6D006B08FB /* AIManuallySetUserIconSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3403F4CE0D2EFE10006B08FB /* AIManuallySetUserIconSource.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   242
		3403F56B0D2F0BDE006B08FB /* AIServersideUserIconSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3403F5690D2F0BDE006B08FB /* AIServersideUserIconSource.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   243
		3403F56C0D2F0BDE006B08FB /* AIServersideUserIconSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3403F56A0D2F0BDE006B08FB /* AIServersideUserIconSource.m */; };
669
6447e4b497b8 Project updates for [25766]
Evan Schoenberg
parents: 666
diff changeset
   244
		34064D100F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34064D0E0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m */; };
6447e4b497b8 Project updates for [25766]
Evan Schoenberg
parents: 666
diff changeset
   245
		34064D110F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34064D0F0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   246
		340670A90A55A4B4004E22AC /* ESGlassSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 340670A70A55A4B4004E22AC /* ESGlassSplitView.m */; };
666
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   247
		34082675075B079800703011 /* Dock Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 3408254D075B078B00703011 /* Dock Icons */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   248
		340C1ABF0BD58FAB00D09235 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340C1ABE0BD58FAB00D09235 /* Security.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   249
		340C1E770BD59A0500D09235 /* GBImportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 340C1E750BD59A0500D09235 /* GBImportPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   250
		340D859B0ADC82D100D05B3F /* sourceListBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 340670790A55A044004E22AC /* sourceListBackground.png */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   251
		34107B4C09E9923D001CC042 /* AIGuestAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34107B4A09E9923D001CC042 /* AIGuestAccountWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   252
		34107B5609E992DA001CC042 /* GuestAccountWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34107B5509E992DA001CC042 /* GuestAccountWindow.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   253
		34167FED081D706300E35678 /* DualWindowMessageAdvanced.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34167FEC081D706200E35678 /* DualWindowMessageAdvanced.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   254
		3419DE730A81042F00C3FC68 /* AccountPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326107CBD598006466F2 /* AccountPrefs.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   255
		3419DE740A81042F00C3FC68 /* BuiltInStatusStates.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327507CBD5B3006466F2 /* BuiltInStatusStates.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   256
		3419DE750A81042F00C3FC68 /* ContactPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326607CBD598006466F2 /* ContactPrefs.plist */; };
4695
be874da9a68d Bring some consistency to the naming of icons as suggested by Paul Wilde. Part 1: chat window toolbar icons. References #15789.
Robert Vehse
parents: 4675
diff changeset
   257
		3419DE760A81042F00C3FC68 /* default-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326707CBD598006466F2 /* default-icon.png */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   258
		3419DE770A81042F00C3FC68 /* DockPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326207CBD598006466F2 /* DockPrefs.plist */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   259
		3419DE780A81042F00C3FC68 /* emoticon32.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   260
		3419DE790A81042F00C3FC68 /* emoticon32_transparent.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F590608199746001F733C /* emoticon32_transparent.tiff */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   261
		3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B995D9092A832700E31E91 /* FontPanelAccessoryView.nib */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   262
		3419DE7C0A81042F00C3FC68 /* lock-locked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF53007A62EB100B92233 /* lock-locked.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   263
		3419DE7D0A81042F00C3FC68 /* lock-unlocked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* lock-unlocked.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   264
		3419DE7E0A81042F00C3FC68 /* remove.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 347E787507CA975900350507 /* remove.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   265
		3419DE7F0A81042F00C3FC68 /* msg-send-file.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326307CBD598006466F2 /* msg-send-file.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   266
		3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   267
		3419DF3B0A8119BF00C3FC68 /* AICalendarDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 340D0A000A7DD1F40059A3AF /* AICalendarDate.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   268
		3419E2DF0A81445800C3FC68 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3419E2DE0A81445800C3FC68 /* Localizable.strings */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   269
		3419F7760531512200C68BA3 /* Adium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
1793
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
   270
		3419FE230531586A00C68BA3 /* Adium.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   271
		341BCF850961354D00CF83F5 /* AIMessageWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BCF810961354D00CF83F5 /* AIMessageWindow.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   272
		341BCF870961354D00CF83F5 /* AIClickThroughThemeDocumentButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BCF830961354D00CF83F5 /* AIClickThroughThemeDocumentButton.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   273
		341BD55D0965E97F00CF83F5 /* ESOTRPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BD5550965E97F00CF83F5 /* ESOTRPreferences.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   274
		341BD55F0965E97F00CF83F5 /* ESOTRPrivateKeyGenerationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BD5570965E97F00CF83F5 /* ESOTRPrivateKeyGenerationWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   275
		341BD5610965E97F00CF83F5 /* ESOTRUnknownFingerprintController.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BD5590965E97F00CF83F5 /* ESOTRUnknownFingerprintController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   276
		341BD5630965E97F00CF83F5 /* ESOTRFingerprintDetailsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BD55B0965E97F00CF83F5 /* ESOTRFingerprintDetailsWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   277
		341BD56C0965E9A500CF83F5 /* AdiumOTREncryption.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BD56A0965E9A500CF83F5 /* AdiumOTREncryption.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   278
		341BD5700965EC3500CF83F5 /* OTRFingerprintDetailsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 341BD56E0965EC3500CF83F5 /* OTRFingerprintDetailsWindow.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   279
		341BD5710965EC3500CF83F5 /* OTRPrivateKeyGenerationWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 341BD56F0965EC3500CF83F5 /* OTRPrivateKeyGenerationWindow.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   280
		341BD57B0965EC4700CF83F5 /* OTRPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 341BD5790965EC4700CF83F5 /* OTRPrefs.nib */; };
414
df90e95d3156 Merge AIMDLogViewerWindowController into its superclass now that it is the only supported log viewer
David Smith
parents: 409
diff changeset
   281
		342353D709D45726009FF634 /* AILogViewerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 342353D509D45725009FF634 /* AILogViewerWindowController.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   282
		3428328907D2643F004F01C9 /* ESStatusPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 3428328507D2643F004F01C9 /* ESStatusPreferences.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   283
		3428328B07D2643F004F01C9 /* ESStatusPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3428328707D2643F004F01C9 /* ESStatusPreferencesPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   284
		342838EE07D2D004004F01C9 /* Shared Dock Icon Images in Resources */ = {isa = PBXBuildFile; fileRef = 342838ED07D2D004004F01C9 /* Shared Dock Icon Images */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   285
		342910CD07AE228600C815F6 /* AIEmoticonPackPreviewTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 342910CB07AE228600C815F6 /* AIEmoticonPackPreviewTableView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   286
		3429BB06070378F700EED705 /* ESFileTransferMessagesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3429BB04070378F700EED705 /* ESFileTransferMessagesPlugin.m */; };
3059
7e6ad9edf243 Replace PTHotKeys with SGHotKeysLib. Fixes #13467.
Stephen Holt <sholt@adium.im>
parents: 3048
diff changeset
   287
		342F88CF0A2A74EB0001DB29 /* SGKeyCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 342F88C90A2A74EA0001DB29 /* SGKeyCombo.m */; };
7e6ad9edf243 Replace PTHotKeys with SGHotKeysLib. Fixes #13467.
Stephen Holt <sholt@adium.im>
parents: 3048
diff changeset
   288
		342F88D10A2A74EB0001DB29 /* SGHotKeyCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 342F88CB0A2A74EA0001DB29 /* SGHotKeyCenter.m */; };
7e6ad9edf243 Replace PTHotKeys with SGHotKeysLib. Fixes #13467.
Stephen Holt <sholt@adium.im>
parents: 3048
diff changeset
   289
		342F88D30A2A74EB0001DB29 /* SGHotKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 342F88CD0A2A74EB0001DB29 /* SGHotKey.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   290
		3430222A0AB4766E0082CF7C /* AINulRemovalPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 343022280AB4766E0082CF7C /* AINulRemovalPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   291
		34333FF3127F6E77007050E8 /* TemporaryIRCAccountWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34333FF2127F6E77007050E8 /* TemporaryIRCAccountWindow.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   292
		343700A70A9C1E170028604E /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 343700A50A9C1E170028604E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   293
		343700A80A9C1E170028604E /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 343700A60A9C1E170028604E /* AIAdvancedPreferencePane.m */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   294
		343700A90A9C1E170028604E /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 343700A50A9C1E170028604E /* AIAdvancedPreferencePane.h */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   295
		34382CEA0A50386C004BF6A2 /* DCMessageContextDisplayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34382CE60A50386C004BF6A2 /* DCMessageContextDisplayPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   296
		34382CEF0A50387A004BF6A2 /* MessageContextDisplayDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34382CEE0A50387A004BF6A2 /* MessageContextDisplayDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   297
		343BB5020C96CB2000506F9B /* AINewBookmarkWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A970670C965F6900F46006 /* AINewBookmarkWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   298
		343BB5B90C96D54000506F9B /* PurpleMySpaceService.h in Headers */ = {isa = PBXBuildFile; fileRef = 343BB5B70C96D54000506F9B /* PurpleMySpaceService.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   299
		343BB5BA0C96D54000506F9B /* PurpleMySpaceService.m in Sources */ = {isa = PBXBuildFile; fileRef = 343BB5B80C96D54000506F9B /* PurpleMySpaceService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   300
		343BB5BD0C96D55400506F9B /* PurpleMySpaceAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 343BB5BB0C96D55400506F9B /* PurpleMySpaceAccount.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   301
		343BB5BE0C96D55400506F9B /* PurpleMySpaceAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 343BB5BC0C96D55400506F9B /* PurpleMySpaceAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   302
		343BB5C10C96D56B00506F9B /* PurpleMySpaceAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 343BB5BF0C96D56B00506F9B /* PurpleMySpaceAccountViewController.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   303
		343BB5C20C96D56B00506F9B /* PurpleMySpaceAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343BB5C00C96D56B00506F9B /* PurpleMySpaceAccountViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   304
		343BB5C40C96D57900506F9B /* PurpleDefaultsMySpace.plist in Resources */ = {isa = PBXBuildFile; fileRef = 343BB5C30C96D57900506F9B /* PurpleDefaultsMySpace.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   305
		343BB63B0C96DC1100506F9B /* MySpace-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 343BB6390C96DC1100506F9B /* MySpace-small.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   306
		343BB63C0C96DC1100506F9B /* MySpace-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 343BB63A0C96DC1100506F9B /* MySpace-large.png */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   307
		343EB3FE08086D2F00E27095 /* AccountProxy.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB3FD08086D2F00E27095 /* AccountProxy.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   308
		343EB40208086D9000E27095 /* AppearancePrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40108086D9000E27095 /* AppearancePrefs.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   309
		343EB41708086D9100E27095 /* StatusSortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41608086D9100E27095 /* StatusSortConfiguration.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   310
		343EC6920809DD3400E27095 /* ListLayoutSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EC6910809DD3400E27095 /* ListLayoutSheet.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   311
		343EC6C1096F7DEA00349098 /* StatusPreferencesAdvanced.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EC6C0096F7DEA00349098 /* StatusPreferencesAdvanced.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   312
		343EC6C8096F7E1700349098 /* ESStatusAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 343EC6C6096F7E1700349098 /* ESStatusAdvancedPreferences.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   313
		343EC9810970C29400349098 /* OfflineContactHidingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 343EC9800970C29400349098 /* OfflineContactHidingDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   314
		343ECBEB0971B18200349098 /* ESShowContactInfoPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343ECBE90971B18200349098 /* ESShowContactInfoPromptController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   315
		343ECBEE0971B18E00349098 /* ShowContactInfoPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343ECBED0971B18E00349098 /* ShowContactInfoPrompt.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   316
		343ECBFC0971B92100349098 /* AIBorderlessListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343ECBFA0971B92100349098 /* AIBorderlessListController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   317
		344458F0070B5BEF00D8E932 /* ESDebugWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344458EE070B5BEF00D8E932 /* ESDebugWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   318
		344499E90B23CA5D0054B761 /* adiumPurpleAccounts.h in Headers */ = {isa = PBXBuildFile; fileRef = 344499E70B23CA5D0054B761 /* adiumPurpleAccounts.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   319
		344499EA0B23CA5D0054B761 /* adiumPurpleAccounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 344499E80B23CA5D0054B761 /* adiumPurpleAccounts.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   320
		344838690BC85EF70083723B /* AccountListPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4B8C3CE80825F60B004B9F45 /* AccountListPreferences.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   321
		344838B50BC860770083723B /* AIAccountListPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B8C3C980825EAF9004B9F45 /* AIAccountListPreferences.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   322
		344839380BC862780083723B /* pref-messages.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336707CBD807006466F2 /* pref-messages.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   323
		3448399A0BC8644C0083723B /* AIAdvancedPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 344839980BC8644C0083723B /* AIAdvancedPreferencesPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   324
		344839A00BC864610083723B /* AIAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 3448399E0BC864610083723B /* AIAdvancedPreferences.m */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   325
		34483A990BC869680083723B /* AdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34483A980BC869680083723B /* AdvancedPreferences.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   326
		3448758E06D1EBDF00DA778C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   327
		3448761406D1EC0C00DA778C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   328
		344D974F0C3C442600498CA1 /* InstantMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 344D97410C3C442500498CA1 /* InstantMessage.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   329
		344D97530C3C442600498CA1 /* Presentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 344D97450C3C442600498CA1 /* Presentity.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   330
		3456231C0A3771D800E7FC97 /* ESRankingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3456231A0A3771D800E7FC97 /* ESRankingCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   331
		345623200A3771E100E7FC97 /* AIChatLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 3456231E0A3771E100E7FC97 /* AIChatLog.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   332
		3456232A0A3771F400E7FC97 /* AILogToGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 345623240A3771F300E7FC97 /* AILogToGroup.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   333
		3456232C0A3771F400E7FC97 /* AILogFromGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 345623260A3771F400E7FC97 /* AILogFromGroup.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   334
		3456232F0A37723400E7FC97 /* LogViewer.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3456232E0A37723400E7FC97 /* LogViewer.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   335
		345623380A3773C300E7FC97 /* LoggingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 345623370A3773C300E7FC97 /* LoggingDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   336
		3456233F0A3773D100E7FC97 /* AILoggerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3456233D0A3773D000E7FC97 /* AILoggerPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   337
		34575E3707CBA874004A4FFF /* DebugWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E3607CBA874004A4FFF /* DebugWindow.nib */; };
4114
56d92a8829ae Removed "Page Setup...", switched MainMenu to XIB and raised its versions to OS X 10.6 and IB 3.2. Fixes #15367.
Patrick Steinhardt <steinhardt.p@me.com>
parents: 4111
diff changeset
   338
		34575E3907CBA88E004A4FFF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E3807CBA88E004A4FFF /* MainMenu.xib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   339
		3459CBED0A25FFBF00ECC256 /* GetMetadataForHTMLLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 3459CBE90A25FFBE00ECC256 /* GetMetadataForHTMLLog.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   340
		3459CBEF0A25FFBF00ECC256 /* GetMetadataForFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3459CBEB0A25FFBE00ECC256 /* GetMetadataForFile.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   341
		345ACC970811C20F008E4D22 /* AwayStatusWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 345ACC960811C20F008E4D22 /* AwayStatusWindow.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   342
		345AFAEE0A5D9A5F00D7DA6F /* AINoisyTableColumn.m in Sources */ = {isa = PBXBuildFile; fileRef = 345AFAEC0A5D9A5F00D7DA6F /* AINoisyTableColumn.m */; };
666
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   343
		345D68990F1FD56B002F2D01 /* facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68950F1FD563002F2D01 /* facebook.png */; };
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   344
		345D689A0F1FD56B002F2D01 /* facebook-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68960F1FD563002F2D01 /* facebook-small.png */; };
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   345
		345D68A20F1FD59F002F2D01 /* PurpleFacebookService.h in Headers */ = {isa = PBXBuildFile; fileRef = 345D68A00F1FD59F002F2D01 /* PurpleFacebookService.h */; };
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   346
		345D68A30F1FD59F002F2D01 /* PurpleFacebookService.m in Sources */ = {isa = PBXBuildFile; fileRef = 345D68A10F1FD59F002F2D01 /* PurpleFacebookService.m */; };
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   347
		345D68A80F1FD5AA002F2D01 /* PurpleFacebookAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 345D68A60F1FD5AA002F2D01 /* PurpleFacebookAccount.h */; };
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   348
		345D68A90F1FD5AA002F2D01 /* PurpleFacebookAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 345D68A70F1FD5AA002F2D01 /* PurpleFacebookAccount.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   349
		345DA0680CA09AD0009F1989 /* Statuses.strings in Resources */ = {isa = PBXBuildFile; fileRef = 345DA0660CA09AD0009F1989 /* Statuses.strings */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   350
		345EE2DF0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   351
		345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F566A08178356001F733C /* AdiumServiceIcons.icns */; };
4712
0b511a094a1e Fix oops
Robert Vehse
parents: 4707
diff changeset
   352
		345F57400817FF80001F733C /* pref-contactList.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F573F0817FF80001F733C /* pref-contactList.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   353
		345F583E08197E74001F733C /* AdiumStatusIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F583D08197E74001F733C /* AdiumStatusIcons.icns */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   354
		345F58C7081990FF001F733C /* msg-log-viewer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F58C6081990FF001F733C /* msg-log-viewer.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   355
		34607EE909B228FE000DB3D2 /* AIContactListNameButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607EE709B228FE000DB3D2 /* AIContactListNameButton.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   356
		34607F1009B2296A000DB3D2 /* AIHoveringPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607F0C09B2296A000DB3D2 /* AIHoveringPopUpButtonCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   357
		34607F1209B2296A000DB3D2 /* AIHoveringPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607F0E09B2296A000DB3D2 /* AIHoveringPopUpButton.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   358
		3461621406FB482D009181D8 /* UserList Theme.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3461621006FB482C009181D8 /* UserList Theme.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   359
		3461621606FB482D009181D8 /* ESChatUserListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3461621206FB482C009181D8 /* ESChatUserListController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   360
		3461621706FB482D009181D8 /* UserList Layout.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3461621306FB482D009181D8 /* UserList Layout.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   361
		346196F20D31607500763051 /* SRSnapback.png in Resources */ = {isa = PBXBuildFile; fileRef = 346196F10D31607500763051 /* SRSnapback.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   362
		346371080BCA0A5400AD57AD /* AIMessageTabSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346371060BCA0A5400AD57AD /* AIMessageTabSplitView.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   363
		346544DB0C8F686B0046ED68 /* AMPurpleJabberXMLConsole.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346544D90C8F686B0046ED68 /* AMPurpleJabberXMLConsole.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   364
		346544DC0C8F686B0046ED68 /* AMPurpleJabberDiscoveryBrowser.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346544DA0C8F686B0046ED68 /* AMPurpleJabberDiscoveryBrowser.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   365
		3465451C0C8F6A670046ED68 /* AMPurpleJabberServiceDiscoveryBrowserController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3465451A0C8F6A670046ED68 /* AMPurpleJabberServiceDiscoveryBrowserController.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   366
		3465451D0C8F6A670046ED68 /* AMPurpleJabberServiceDiscoveryBrowserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3465451B0C8F6A670046ED68 /* AMPurpleJabberServiceDiscoveryBrowserController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   367
		346545250C8F6AAD0046ED68 /* AMPurpleJabberNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 346545230C8F6AAD0046ED68 /* AMPurpleJabberNode.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   368
		346545260C8F6AAD0046ED68 /* AMPurpleJabberNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 346545240C8F6AAD0046ED68 /* AMPurpleJabberNode.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   369
		346545B90C8F71380046ED68 /* AMPurpleJabberAdHocCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 346545B70C8F71370046ED68 /* AMPurpleJabberAdHocCommand.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   370
		346545BA0C8F71380046ED68 /* AMPurpleJabberAdHocCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 346545B80C8F71380046ED68 /* AMPurpleJabberAdHocCommand.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   371
		346545CB0C8F73000046ED68 /* AMPurpleJabberAdHocPing.h in Headers */ = {isa = PBXBuildFile; fileRef = 346545C90C8F73000046ED68 /* AMPurpleJabberAdHocPing.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   372
		346545CC0C8F73000046ED68 /* AMPurpleJabberAdHocPing.m in Sources */ = {isa = PBXBuildFile; fileRef = 346545CA0C8F73000046ED68 /* AMPurpleJabberAdHocPing.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   373
		346935D60BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346935D40BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   374
		346BA33F0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA33D0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   375
		346BA3450774C2D200628F06 /* ESGlobalEventsPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA3430774C2D200628F06 /* ESGlobalEventsPreferences.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   376
		346BA3640774C35500628F06 /* GlobalEventsPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346BA3630774C35400628F06 /* GlobalEventsPreferences.nib */; };
4319
e053e15ad337 Backout 8983c14bea2f since some people have issues compiling Adium. Fixes #15391
Frank Dowsett <wixardy@adium.im>
parents: 4302
diff changeset
   377
		346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 346F5CB308A418FB0055C610 /* CurrentTunes.scpt */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   378
		347374BD0AA9206B00AD18E3 /* ShortcutRecorder.strings in Resources */ = {isa = PBXBuildFile; fileRef = 347374BB0AA9206B00AD18E3 /* ShortcutRecorder.strings */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   379
		3474E000082550FD00BF30F0 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 3474DFFF082550FD00BF30F0 /* Credits.rtf */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   380
		3474E0910825634300BF30F0 /* StatusPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3474E0900825634300BF30F0 /* StatusPreferences.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   381
		347933F30C861017007ADCAA /* AIColorStringTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = 347933F10C861017007ADCAA /* AIColorStringTransformer.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   382
		347933F40C861017007ADCAA /* AIColorStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 347933F20C861017007ADCAA /* AIColorStringTransformer.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   383
		347C6943080C8F2B00E69674 /* ESAwayStatusWindowPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347C6941080C8F2B00E69674 /* ESAwayStatusWindowPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   384
		347C6949080C8F3B00E69674 /* ESAwayStatusWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347C6947080C8F3A00E69674 /* ESAwayStatusWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   385
		347E39DC0A98AA4A00961B0E /* missing_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E39DB0A98AA4A00961B0E /* missing_image.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   386
		347E77F407CA94FF00350507 /* ESAccountEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E77F207CA94FE00350507 /* ESAccountEvents.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   387
		347E781407CA961300350507 /* ESUserIconHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */; };
4701
ca4139b19fe7 Both the icon in the "Get Info" window and and the "Contact icon" in the chat window's toolbar are placeholders for a contact icon so give them the same icon.
Robert Vehse
parents: 4700
diff changeset
   388
		347E781A07CA962100350507 /* events-contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* events-contact.png */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   389
		347E782907CA964600350507 /* AIContactSortSelectionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   390
		347E782A07CA964700350507 /* ESContactSortConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   391
		347E783407CA967100350507 /* SortingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E783307CA967100350507 /* SortingDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   392
		347E784C07CA96D700350507 /* AIContactListEditorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E784A07CA96D600350507 /* AIContactListEditorPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   393
		347E785407CA96E200350507 /* AINewContactWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785207CA96E200350507 /* AINewContactWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   394
		347E786007CA970500350507 /* AINewGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785E07CA970500350507 /* AINewGroupWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   395
		347E786B07CA972100350507 /* AddContact.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786907CA972100350507 /* AddContact.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   396
		347E786C07CA972100350507 /* AddGroup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786A07CA972100350507 /* AddGroup.nib */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   397
		347E787807CA975900350507 /* msg-add-contact.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 347E787207CA975900350507 /* msg-add-contact.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   398
		347E788907CA978E00350507 /* CBActionSupportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E788707CA978D00350507 /* CBActionSupportPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   399
		347E791307CAA51500350507 /* AIManualSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790D07CAA51400350507 /* AIManualSort.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   400
		347E791507CAA51500350507 /* ESStatusSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790F07CAA51400350507 /* ESStatusSort.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   401
		347E791807CAA51500350507 /* AIAlphabeticalSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E791207CAA51400350507 /* AIAlphabeticalSort.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   402
		347E792307CAA52300350507 /* StatusSortDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E791E07CAA52300350507 /* StatusSortDefaults.plist */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   403
		347E792507CAA52300350507 /* AlphabeticalSortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E792007CAA52300350507 /* AlphabeticalSortConfiguration.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   404
		347E792607CAA52300350507 /* AlphabeticalSortDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E792107CAA52300350507 /* AlphabeticalSortDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   405
		347E7A9007CAF88200350507 /* AIContactAwayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A8E07CAF88200350507 /* AIContactAwayPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   406
		347E7A9907CAF8AF00350507 /* ESContactClientPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A9407CAF8AE00350507 /* ESContactClientPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   407
		347E7A9C07CAF8AF00350507 /* AIContactIdlePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A9707CAF8AF00350507 /* AIContactIdlePlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   408
		347E7AA307CAF8DA00350507 /* BGContactNotesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AA107CAF8DA00350507 /* BGContactNotesPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   409
		347E7AAA07CAF8EE00350507 /* SAContactOnlineForPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AA807CAF8EE00350507 /* SAContactOnlineForPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   410
		347E7AB307CAF93700350507 /* AIContactOnlineSincePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AB107CAF93700350507 /* AIContactOnlineSincePlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   411
		347E7ABC07CAF94A00350507 /* ESContactServersideDisplayName.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7ABA07CAF94A00350507 /* ESContactServersideDisplayName.m */; };
2015
1679180a5b2d Add tooltips for closed groups. Fixes #11951
Colin Barrett <colin@springsandstruts.com>
parents: 1967
diff changeset
   412
		347E7ACF07CAF98500350507 /* AIListObjectContentsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7ACD07CAF98400350507 /* AIListObjectContentsPlugin.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   413
		347F4B810D340F16006D5A56 /* AIPreferenceContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 347F4B800D340F16006D5A56 /* AIPreferenceContainer.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   414
		3482E0F50AB5064E00471992 /* AIAdiumProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3482E0EB0AB5063300471992 /* AIAdiumProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   415
		348477140C1A5CE50019EF08 /* AIAnimatingListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348477120C1A5CE50019EF08 /* AIAnimatingListOutlineView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   416
		34847ADE0C1A62C40019EF08 /* AIOutlineViewAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34847ADC0C1A62C40019EF08 /* AIOutlineViewAnimation.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   417
		3485D8EA09EB446900232CC4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   418
		3485D8EB09EB446900232CC4 /* Adium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   419
		3485DB1809EBCE6500232CC4 /* SLPurpleCocoaAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 34048AC50617CB4C004D0B7E /* SLPurpleCocoaAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   420
		3485DB1909EBCE6500232CC4 /* SLPurpleCocoaAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34048AC60617CB4C004D0B7E /* SLPurpleCocoaAdapter.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   421
		3485DB1A09EBCE6500232CC4 /* adiumPurpleBlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE10907A2EE3700663CC9 /* adiumPurpleBlist.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   422
		3485DB1B09EBCE6500232CC4 /* adiumPurpleBlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE10A07A2EE3700663CC9 /* adiumPurpleBlist.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   423
		3485DB1C09EBCE6500232CC4 /* adiumPurpleConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE0E907A2ECCF00663CC9 /* adiumPurpleConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   424
		3485DB1D09EBCE6500232CC4 /* adiumPurpleConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE0EA07A2ECD000663CC9 /* adiumPurpleConnection.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   425
		3485DB1E09EBCE6500232CC4 /* adiumPurpleConversation.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE17E07A2F10400663CC9 /* adiumPurpleConversation.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   426
		3485DB1F09EBCE6500232CC4 /* adiumPurpleConversation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE17F07A2F10400663CC9 /* adiumPurpleConversation.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   427
		3485DB2009EBCE6500232CC4 /* adiumPurpleCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE1B207A2F36400663CC9 /* adiumPurpleCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   428
		3485DB2109EBCE6500232CC4 /* adiumPurpleCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE1B307A2F36400663CC9 /* adiumPurpleCore.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   429
		3485DB2209EBCE6500232CC4 /* adiumPurpleEventloop.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE18A07A2F2A600663CC9 /* adiumPurpleEventloop.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   430
		3485DB2309EBCE6500232CC4 /* adiumPurpleEventloop.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE18B07A2F2A600663CC9 /* adiumPurpleEventloop.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   431
		3485DB2409EBCE6500232CC4 /* adiumPurpleFt.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE11007A2EED500663CC9 /* adiumPurpleFt.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   432
		3485DB2509EBCE6500232CC4 /* adiumPurpleFt.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11107A2EED600663CC9 /* adiumPurpleFt.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   433
		3485DB2609EBCE6500232CC4 /* adiumPurpleNotify.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE12207A2EFF800663CC9 /* adiumPurpleNotify.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   434
		3485DB2709EBCE6500232CC4 /* adiumPurpleNotify.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE12307A2EFF800663CC9 /* adiumPurpleNotify.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   435
		3485DB2809EBCE6500232CC4 /* adiumPurplePrivacy.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE11607A2EF2B00663CC9 /* adiumPurplePrivacy.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   436
		3485DB2909EBCE6500232CC4 /* adiumPurplePrivacy.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11707A2EF2B00663CC9 /* adiumPurplePrivacy.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   437
		3485DB2A09EBCE6500232CC4 /* adiumPurpleRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE11C07A2EF7F00663CC9 /* adiumPurpleRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   438
		3485DB2B09EBCE6500232CC4 /* adiumPurpleRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11D07A2EF7F00663CC9 /* adiumPurpleRequest.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   439
		3485DB2C09EBCE6500232CC4 /* adiumPurpleRoomlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE12807A2F09A00663CC9 /* adiumPurpleRoomlist.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   440
		3485DB2D09EBCE6500232CC4 /* adiumPurpleRoomlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE12907A2F09B00663CC9 /* adiumPurpleRoomlist.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   441
		3485DB2E09EBCE6500232CC4 /* adiumPurpleSignals.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE1B807A2F4C500663CC9 /* adiumPurpleSignals.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   442
		3485DB2F09EBCE6500232CC4 /* adiumPurpleSignals.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE1B907A2F4C500663CC9 /* adiumPurpleSignals.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   443
		3485DB3009EBCE6500232CC4 /* adiumPurpleWebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE18407A2F20E00663CC9 /* adiumPurpleWebcam.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   444
		3485DB3109EBCE6500232CC4 /* adiumPurpleWebcam.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE18507A2F20E00663CC9 /* adiumPurpleWebcam.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   445
		3485DB3709EBCE7400232CC4 /* PurpleService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34415A63059F9B9B0019246B /* PurpleService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   446
		3485DB3809EBCE7400232CC4 /* PurpleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415A64059F9B9B0019246B /* PurpleService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   447
		3485DB3909EBCE7400232CC4 /* CBPurpleAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B7F278705440C8D00CDFC90 /* CBPurpleAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   448
		3485DB3A09EBCE7400232CC4 /* CBPurpleAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 348FF83E09128BEB00A942A8 /* CBPurpleAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   449
		3485DB5909EBCE7400232CC4 /* ESGaduGaduService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34416159059FC5330019246B /* ESGaduGaduService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   450
		3485DB5A09EBCE7400232CC4 /* ESGaduGaduService.m in Sources */ = {isa = PBXBuildFile; fileRef = 3441615A059FC5340019246B /* ESGaduGaduService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   451
		3485DB5B09EBCE7400232CC4 /* ESPurpleGaduGaduAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34416070059FC27D0019246B /* ESPurpleGaduGaduAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   452
		3485DB5C09EBCE7400232CC4 /* ESPurpleGaduGaduAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34416071059FC27D0019246B /* ESPurpleGaduGaduAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   453
		3485DB5D09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D961C06B73B38005235E9 /* DCPurpleGaduGaduJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   454
		3485DB5E09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961D06B73B38005235E9 /* DCPurpleGaduGaduJoinChatViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   455
		3485DB5F09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D961B06B73B38005235E9 /* DCPurpleGaduGaduJoinChatView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   456
		3485DB6009EBCE7400232CC4 /* ESPurpleGaduGaduAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34416085059FC2A30019246B /* ESPurpleGaduGaduAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   457
		3485DB6109EBCE7400232CC4 /* ESPurpleGaduGaduAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34416086059FC2A30019246B /* ESPurpleGaduGaduAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   458
		3485DB6209EBCE7400232CC4 /* ESPurpleGaduGaduAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40308086D9000E27095 /* ESPurpleGaduGaduAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   459
		3485DB6309EBCE7400232CC4 /* PurpleDefaultsGadu-Gadu.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76473F07A07B620021CCD7 /* PurpleDefaultsGadu-Gadu.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   460
		3485DB6409EBCE7400232CC4 /* ESJabberService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34416171059FC55A0019246B /* ESJabberService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   461
		3485DB6509EBCE7400232CC4 /* ESJabberService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34416172059FC55A0019246B /* ESJabberService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   462
		3485DB6609EBCE7400232CC4 /* ESPurpleJabberAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 344160C3059FC3080019246B /* ESPurpleJabberAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   463
		3485DB6709EBCE7400232CC4 /* ESPurpleJabberAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 344160C4059FC3080019246B /* ESPurpleJabberAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   464
		3485DB6809EBCE7400232CC4 /* DCPurpleJabberJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D962206B73BE0005235E9 /* DCPurpleJabberJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   465
		3485DB6909EBCE7400232CC4 /* DCPurpleJabberJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D962306B73BE0005235E9 /* DCPurpleJabberJoinChatViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   466
		3485DB6A09EBCE7400232CC4 /* DCPurpleJabberJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41808086D9100E27095 /* DCPurpleJabberJoinChatView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   467
		3485DB6B09EBCE7400232CC4 /* ESPurpleJabberAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 344160B4059FC2F50019246B /* ESPurpleJabberAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   468
		3485DB6C09EBCE7400232CC4 /* ESPurpleJabberAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344160B5059FC2F50019246B /* ESPurpleJabberAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   469
		3485DB6D09EBCE7400232CC4 /* ESPurpleJabberAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42208086D9200E27095 /* ESPurpleJabberAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   470
		3485DB6E09EBCE7400232CC4 /* PurpleDefaultsJabber.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BB19298079EE90900DAA523 /* PurpleDefaultsJabber.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   471
		3485DB6F09EBCE7400232CC4 /* AIPurpleGTalkAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C0431B08D74D3100B48CE1 /* AIPurpleGTalkAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   472
		3485DB7009EBCE7400232CC4 /* AIPurpleGTalkAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0431C08D74D3100B48CE1 /* AIPurpleGTalkAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   473
		3485DB7109EBCE7400232CC4 /* AIPurpleGTalkAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C0431D08D74D3100B48CE1 /* AIPurpleGTalkAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   474
		3485DB7209EBCE7400232CC4 /* AIPurpleGTalkAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0431E08D74D3100B48CE1 /* AIPurpleGTalkAccountViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   475
		3485DB7309EBCE7400232CC4 /* AIGTalkService.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C0431F08D74D3100B48CE1 /* AIGTalkService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   476
		3485DB7409EBCE7400232CC4 /* AIGTalkService.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0432008D74D3100B48CE1 /* AIGTalkService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   477
		3485DB7509EBCE7400232CC4 /* PurpleDefaultsGTalk.plist in Resources */ = {isa = PBXBuildFile; fileRef = A3C042D108D7483100B48CE1 /* PurpleDefaultsGTalk.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   478
		3485DB7609EBCE7400232CC4 /* ESMeanwhileService.h in Headers */ = {isa = PBXBuildFile; fileRef = 343A7F3806935DD700150CEC /* ESMeanwhileService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   479
		3485DB7709EBCE7400232CC4 /* ESMeanwhileService.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F3706935DD700150CEC /* ESMeanwhileService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   480
		3485DB7809EBCE7400232CC4 /* ESPurpleMeanwhileAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 343A7F2D06935DC500150CEC /* ESPurpleMeanwhileAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   481
		3485DB7909EBCE7400232CC4 /* ESPurpleMeanwhileAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F2C06935DC500150CEC /* ESPurpleMeanwhileAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   482
		3485DB7A09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D962806B73C18005235E9 /* DCPurpleMeanwhileJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   483
		3485DB7B09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D962906B73C18005235E9 /* DCPurpleMeanwhileJoinChatViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   484
		3485DB7C09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41408086D9100E27095 /* DCPurpleMeanwhileJoinChatView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   485
		3485DB7D09EBCE7400232CC4 /* ESPurpleMeanwhileAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 343A7F2B06935DC500150CEC /* ESPurpleMeanwhileAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   486
		3485DB7E09EBCE7400232CC4 /* ESPurpleMeanwhileAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F2A06935DC500150CEC /* ESPurpleMeanwhileAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   487
		3485DB7F09EBCE7400232CC4 /* ESPurpleMeanwhileAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41E08086D9100E27095 /* ESPurpleMeanwhileAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   488
		3485DB8009EBCE7400232CC4 /* PurpleDefaultsSametime.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76474C07A07B900021CCD7 /* PurpleDefaultsSametime.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   489
		3485DB8109EBCE7400232CC4 /* ESMSNService.h in Headers */ = {isa = PBXBuildFile; fileRef = 344158A9059F90FA0019246B /* ESMSNService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   490
		3485DB8209EBCE7400232CC4 /* ESMSNService.m in Sources */ = {isa = PBXBuildFile; fileRef = 344158AA059F90FB0019246B /* ESMSNService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   491
		3485DB8309EBCE7400232CC4 /* ESPurpleMSNAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 3441593F059F94C10019246B /* ESPurpleMSNAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   492
		3485DB8409EBCE7400232CC4 /* ESPurpleMSNAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415940059F94C10019246B /* ESPurpleMSNAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   493
		3485DB8509EBCE7400232CC4 /* DCPurpleMSNJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D962E06B73C4D005235E9 /* DCPurpleMSNJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   494
		3485DB8609EBCE7400232CC4 /* DCPurpleMSNJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D962F06B73C4D005235E9 /* DCPurpleMSNJoinChatViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   495
		3485DB8709EBCE7400232CC4 /* DCPurpleMSNJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D962D06B73C4D005235E9 /* DCPurpleMSNJoinChatView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   496
		3485DB8809EBCE7400232CC4 /* ESPurpleMSNAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 344159B3059F977F0019246B /* ESPurpleMSNAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   497
		3485DB8909EBCE7400232CC4 /* ESPurpleMSNAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344159B4059F97800019246B /* ESPurpleMSNAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   498
		3485DB8A09EBCE7400232CC4 /* ESPurpleMSNAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40508086D9000E27095 /* ESPurpleMSNAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   499
		3485DB8B09EBCE7400232CC4 /* PurpleDefaultsMSN.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7644DD07A05E7E0021CCD7 /* PurpleDefaultsMSN.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   500
		3485DB8F09EBCE7400232CC4 /* ESNovellService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C2EA180634DB5E0018E5D2 /* ESNovellService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   501
		3485DB9009EBCE7400232CC4 /* ESNovellService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2EA190634DB5E0018E5D2 /* ESNovellService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   502
		3485DB9109EBCE7400232CC4 /* ESPurpleNovellAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C2E66F0634CF5F0018E5D2 /* ESPurpleNovellAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   503
		3485DB9209EBCE7400232CC4 /* ESPurpleNovellAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2E6700634CF5F0018E5D2 /* ESPurpleNovellAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   504
		3485DB9309EBCE7400232CC4 /* DCPurpleNovellJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EA3688306B73E7D009CA81A /* DCPurpleNovellJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   505
		3485DB9409EBCE7400232CC4 /* DCPurpleNovellJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA3688406B73E7D009CA81A /* DCPurpleNovellJoinChatViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   506
		3485DB9509EBCE7400232CC4 /* DCPurpleNovellJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EA3688206B73E7D009CA81A /* DCPurpleNovellJoinChatView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   507
		3485DB9609EBCE7400232CC4 /* ESPurpleNovellAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C2E6870634CF940018E5D2 /* ESPurpleNovellAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   508
		3485DB9709EBCE7400232CC4 /* ESPurpleNovellAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2E6880634CF940018E5D2 /* ESPurpleNovellAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   509
		3485DB9809EBCE7400232CC4 /* ESPurpleNovellAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB3FF08086D9000E27095 /* ESPurpleNovellAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   510
		3485DB9909EBCE7400232CC4 /* PurpleDefaultsGroupWise.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76476007A07BC90021CCD7 /* PurpleDefaultsGroupWise.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   511
		3485DB9A09EBCE7400232CC4 /* ESSimpleService.h in Headers */ = {isa = PBXBuildFile; fileRef = 345A7B590954AD1400FF3113 /* ESSimpleService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   512
		3485DB9B09EBCE7400232CC4 /* ESSimpleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B5A0954AD1400FF3113 /* ESSimpleService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   513
		3485DB9C09EBCE7400232CC4 /* ESPurpleSimpleAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 345A7B650954AD2800FF3113 /* ESPurpleSimpleAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   514
		3485DB9D09EBCE7400232CC4 /* ESPurpleSimpleAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B660954AD2800FF3113 /* ESPurpleSimpleAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   515
		3485DB9E09EBCE7400232CC4 /* ESPurpleSimpleAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 345A7B6B0954AD3A00FF3113 /* ESPurpleSimpleAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   516
		3485DB9F09EBCE7400232CC4 /* ESPurpleSimpleAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B6C0954AD3A00FF3113 /* ESPurpleSimpleAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   517
		3485DBA009EBCE7400232CC4 /* ESPurpleSimpleAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 345A7B830954AEF400FF3113 /* ESPurpleSimpleAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   518
		3485DBA109EBCE7400232CC4 /* PurpleDefaultsSimple.plist in Resources */ = {isa = PBXBuildFile; fileRef = 345A7B710954AD4D00FF3113 /* PurpleDefaultsSimple.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   519
		3485DBA209EBCE7400232CC4 /* ESYahooService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34415B9B059FA8DF0019246B /* ESYahooService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   520
		3485DBA309EBCE7400232CC4 /* ESYahooService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415B9C059FA8DF0019246B /* ESYahooService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   521
		3485DBA409EBCE7400232CC4 /* ESPurpleYahooAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34415BD1059FA9CE0019246B /* ESPurpleYahooAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   522
		3485DBA509EBCE7400232CC4 /* ESPurpleYahooAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415BCF059FA9CD0019246B /* ESPurpleYahooAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   523
		3485DBA609EBCE7400232CC4 /* DCPurpleYahooJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EA3688F06B73F67009CA81A /* DCPurpleYahooJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   524
		3485DBA709EBCE7400232CC4 /* DCPurpleYahooJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA3689006B73F67009CA81A /* DCPurpleYahooJoinChatViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   525
		3485DBA809EBCE7400232CC4 /* DCPurpleYahooJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40E08086D9100E27095 /* DCPurpleYahooJoinChatView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   526
		3485DBA909EBCE7400232CC4 /* ESPurpleYahooAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 342928080628BB4200BB9217 /* ESPurpleYahooAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   527
		3485DBAA09EBCE7400232CC4 /* ESPurpleYahooAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 342928090628BB4200BB9217 /* ESPurpleYahooAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   528
		3485DBAB09EBCE7400232CC4 /* ESPurpleYahooAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42008086D9200E27095 /* ESPurpleYahooAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   529
		3485DBAC09EBCE7400232CC4 /* PurpleDefaultsYahoo!.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76471707A079A40021CCD7 /* PurpleDefaultsYahoo!.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   530
		3485DBAD09EBCE7400232CC4 /* ESYahooJapanService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E3C8870638D40500AA3EF7 /* ESYahooJapanService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   531
		3485DBAE09EBCE7400232CC4 /* ESYahooJapanService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E3C8880638D40500AA3EF7 /* ESYahooJapanService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   532
		3485DBAF09EBCE7400232CC4 /* ESPurpleYahooJapanAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E3C8A50638D50F00AA3EF7 /* ESPurpleYahooJapanAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   533
		3485DBB009EBCE7400232CC4 /* ESPurpleYahooJapanAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E3C8A60638D50F00AA3EF7 /* ESPurpleYahooJapanAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   534
		3485DBB109EBCE7400232CC4 /* PurpleDefaultsYahoo! Japan.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76478507A07C440021CCD7 /* PurpleDefaultsYahoo! Japan.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   535
		3485DBB209EBCE7400232CC4 /* ESZephyrService.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D1B06CC079F00449EBB /* ESZephyrService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   536
		3485DBB309EBCE7400232CC4 /* ESZephyrService.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D1A06CC079F00449EBB /* ESZephyrService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   537
		3485DBB409EBCE7400232CC4 /* ESPurpleZephyrAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D2806CC07BD00449EBB /* ESPurpleZephyrAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   538
		3485DBB509EBCE7400232CC4 /* ESPurpleZephyrAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2606CC07BD00449EBB /* ESPurpleZephyrAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   539
		3485DBB609EBCE7400232CC4 /* DCPurpleZephyrJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D2706CC07BD00449EBB /* DCPurpleZephyrJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   540
		3485DBB709EBCE7400232CC4 /* DCPurpleZephyrJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2506CC07BD00449EBB /* DCPurpleZephyrJoinChatViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   541
		3485DBB809EBCE7400232CC4 /* DCPurpleZephyrJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40908086D9100E27095 /* DCPurpleZephyrJoinChatView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   542
		3485DBB909EBCE7400232CC4 /* ESPurpleZephyrAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D2406CC07BD00449EBB /* ESPurpleZephyrAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   543
		3485DBBA09EBCE7400232CC4 /* ESPurpleZephyrAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2206CC07BC00449EBB /* ESPurpleZephyrAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   544
		3485DBBB09EBCE7400232CC4 /* ESPurpleZephyrAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41208086D9100E27095 /* ESPurpleZephyrAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   545
		3485DBBC09EBCE7400232CC4 /* PurpleDefaultsZephyr.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7646CE07A078E60021CCD7 /* PurpleDefaultsZephyr.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   546
		3485DBBD09EBCE7400232CC4 /* ESPurpleNotifyEmailController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E0103307B956F6000DF265 /* ESPurpleNotifyEmailController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   547
		3485DBBE09EBCE7400232CC4 /* ESPurpleNotifyEmailController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0103207B956F6000DF265 /* ESPurpleNotifyEmailController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   548
		3485DBBF09EBCE7400232CC4 /* ESPurpleRequestAbstractWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AEE7E808E35A5800AE1C78 /* ESPurpleRequestAbstractWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   549
		3485DBC009EBCE7400232CC4 /* ESPurpleRequestAbstractWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AEE7E908E35A5800AE1C78 /* ESPurpleRequestAbstractWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   550
		3485DBC109EBCE7400232CC4 /* ESPurpleRequestWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3499F4A706309AF60035B468 /* ESPurpleRequestWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   551
		3485DBC209EBCE7400232CC4 /* ESPurpleRequestWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3499F4A606309AF60035B468 /* ESPurpleRequestWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   552
		3485DBC309EBCE7400232CC4 /* PurpleMultilineRequestWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34C2CF85063340540018E5D2 /* PurpleMultilineRequestWindow.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   553
		3485DBC409EBCE7400232CC4 /* PurpleSinglelineRequestWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34C2CF86063340540018E5D2 /* PurpleSinglelineRequestWindow.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   554
		3485DBC809EBCE7400232CC4 /* ESPurpleFileReceiveRequestController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AEE7DC08E3546F00AE1C78 /* ESPurpleFileReceiveRequestController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   555
		3485DBC909EBCE7400232CC4 /* ESPurpleFileReceiveRequestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AEE7DD08E3546F00AE1C78 /* ESPurpleFileReceiveRequestController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   556
		3485DBCA09EBCE7400232CC4 /* ESPurpleRequestActionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 341E88680648FF1B00E0C828 /* ESPurpleRequestActionController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   557
		3485DBCB09EBCE7400232CC4 /* ESPurpleRequestActionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 341E88690648FF1B00E0C828 /* ESPurpleRequestActionController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   558
		3485DBD009EBCE8200232CC4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3402E04D07CB0EB00044F818 /* Localizable.strings */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   559
		34891C140D4B75EE00AEF48C /* AIStandardListScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34891C130D4B75EE00AEF48C /* AIStandardListScrollView.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   560
		348B250D0A50A1C900B2B972 /* ESSourceListBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348B250B0A50A1C900B2B972 /* ESSourceListBackgroundView.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   561
		348C47170D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348C47160D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   562
		348F57940936F3CC00288E41 /* ESEditStatusGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348F57920936F3CC00288E41 /* ESEditStatusGroupWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   563
		348F579E0936FA6D00288E41 /* EditStatusGroup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 348F579D0936FA6D00288E41 /* EditStatusGroup.nib */; };
3480
419e7f849625 Missed adding these files to the project after a bad merge
Evan Schoenberg
parents: 3479
diff changeset
   564
		349062A2127F7E6900FC313F /* AITemporaryIRCAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349062A1127F7E6900FC313F /* AITemporaryIRCAccountWindowController.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   565
		349195660C9662AA00595A04 /* AIListBookmark.m in Sources */ = {isa = PBXBuildFile; fileRef = 349195640C9662AA00595A04 /* AIListBookmark.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   566
		349195670C9662AA00595A04 /* AIListBookmark.h in Headers */ = {isa = PBXBuildFile; fileRef = 349195650C9662AA00595A04 /* AIListBookmark.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   567
		3496A8C207CE6B880055BBAB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3496A8C107CE6B880055BBAB /* InfoPlist.strings */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   568
		349710DD096C4C7700699948 /* Buttons.strings in Resources */ = {isa = PBXBuildFile; fileRef = 349710DB096C4C7700699948 /* Buttons.strings */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   569
		349C2F470867AD16000BF883 /* ApplescriptRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C2F460867AD16000BF883 /* ApplescriptRunner.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   570
		349C2FF00867AD65000BF883 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 349C2FEF0867AD65000BF883 /* Foundation.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   571
		349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */ = {isa = PBXBuildFile; fileRef = 349C2EFA0867AC97000BF883 /* AdiumApplescriptRunner */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   572
		349C6E4907C96D45005EB896 /* CBContactCountingDisplayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E4607C96D44005EB896 /* CBContactCountingDisplayPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   573
		349C6E8E07C972B2005EB896 /* AIExtendedStatusPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E8C07C972B2005EB896 /* AIExtendedStatusPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   574
		349C6F6607C99ACF005EB896 /* ESContactListAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6F6407C99ACE005EB896 /* ESContactListAdvancedPreferences.m */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   575
		349C7C7A07C9AE1B005EB896 /* ContactListAdvancedPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 349C6F8A07C99D2C005EB896 /* ContactListAdvancedPrefs.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   576
		349E2E8E07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349E2E8C07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   577
		34A1A8CA0DFB246400AC78CF /* AISocialNetworkingStatusMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 34A1A8C80DFB246300AC78CF /* AISocialNetworkingStatusMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   578
		34A1A8CB0DFB246400AC78CF /* AISocialNetworkingStatusMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1A8C90DFB246300AC78CF /* AISocialNetworkingStatusMenu.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   579
		34A1A8E70DFB276E00AC78CF /* SocialNetworkingCustomStatus.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1A8E60DFB276E00AC78CF /* SocialNetworkingCustomStatus.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   580
		34A1A8ED0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34A1A8EB0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   581
		34A1A8EE0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1A8EC0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   582
		34A1AB6C0DFC531000AC78CF /* AIXMLChatlogConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1AB6B0DFC531000AC78CF /* AIXMLChatlogConverter.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   583
		34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEE80DFD4BFE00AC78CF /* AIAddressBookInspectorPane.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   584
		34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEED0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   585
		34A1B2C30DFDBA1200AC78CF /* AIStringDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B2C20DFDBA1200AC78CF /* AIStringDebug.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   586
		34A250B607E0F822009854E1 /* StatusDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34A250B507E0F822009854E1 /* StatusDefaults.plist */; };
666
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
   587
		34A29DB706ED68C000E1366C /* Contact List in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 34A29D9406ED68BF00E1366C /* Contact List */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   588
		34A489F306F64359002C7C5F /* AISCLViewPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489F106F64359002C7C5F /* AISCLViewPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   589
		34A48A0106F6436D002C7C5F /* AIStandardListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489FB06F6436D002C7C5F /* AIStandardListWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   590
		34A48A0406F6436D002C7C5F /* AIListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489FE06F6436D002C7C5F /* AIListWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   591
		34A48A1006F64382002C7C5F /* ContactListWindowBorderless.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A48A0F06F64381002C7C5F /* ContactListWindowBorderless.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   592
		34A48A1806F6438F002C7C5F /* AIBorderlessListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A1406F6438F002C7C5F /* AIBorderlessListWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   593
		34A48A1906F6438F002C7C5F /* AIListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A1506F6438F002C7C5F /* AIListController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   594
		34A48A3F06F64665002C7C5F /* AIListThemeWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A3B06F64664002C7C5F /* AIListThemeWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   595
		34A48A4106F64665002C7C5F /* AIListLayoutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A3D06F64665002C7C5F /* AIListLayoutWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   596
		34A48A5006F64692002C7C5F /* AITextColorPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A4F06F64692002C7C5F /* AITextColorPreviewView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   597
		34A48B3A06F64B27002C7C5F /* AIBorderlessListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48B3806F64B27002C7C5F /* AIBorderlessListOutlineView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   598
		34A663920BF66D96008637BB /* PurpleCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 340915F105C0A5DF00CDE3DD /* PurpleCommon.h */; settings = {ATTRIBUTES = (Public, ); }; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   599
		34A6F68507D65D6200972830 /* GeneralPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A6F68407D65D6200972830 /* GeneralPreferences.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   600
		34A6FAD907D6F3AA00972830 /* AIEventSoundsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A6FAD507D6F3A600972830 /* AIEventSoundsPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   601
		34A6FADB07D6F3AA00972830 /* ESEventSoundAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A6FAD707D6F3A700972830 /* ESEventSoundAlertDetailPane.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   602
		34A6FB2607D6F97B00972830 /* EventSoundContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB2507D6F97B00972830 /* EventSoundContactAlert.nib */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   603
		34A6FB2D07D6F98600972830 /* events-sound-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB2B07D6F98600972830 /* events-sound-alert.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   604
		34A6FB2E07D6F98600972830 /* SoundFileIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB2C07D6F98600972830 /* SoundFileIcon.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   605
		34A88E180C7A26E0006EB7D4 /* AIPasswordPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = F55B416603AB8BFC01A8010A /* AIPasswordPromptController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   606
		34A88E190C7A26E1006EB7D4 /* AIPasswordPromptController.h in Headers */ = {isa = PBXBuildFile; fileRef = F55B416E03AB8C3201A8010A /* AIPasswordPromptController.h */; settings = {ATTRIBUTES = (Public, ); }; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   607
		34A9705A0C965F2400F46006 /* AISideSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A970590C965F2400F46006 /* AISideSplitView.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   608
		34A9706F0C965F8E00F46006 /* AIAddBookmarkPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A9706D0C965F8E00F46006 /* AIAddBookmarkPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   609
		34A970740C965FC800F46006 /* AddBookmark.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A970730C965FC800F46006 /* AddBookmark.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   610
		34A9707E0C96602300F46006 /* sidebarStatusAreaBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A9707D0C96602200F46006 /* sidebarStatusAreaBackground.png */; };
4147
898fdd953c65 Backed out changeset 1e84ee0e55a9, it was used in a NIB.
Patrick Steinhardt <steinhardt.p@me.com>
parents: 4146
diff changeset
   611
		34AE249E09BCCFA900A35B51 /* AIWindowDraggingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AE249C09BCCFA900A35B51 /* AIWindowDraggingView.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   612
		34B1268E0B924E28003B0451 /* adiumPurpleDnsRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B1268C0B924E28003B0451 /* adiumPurpleDnsRequest.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   613
		34B1268F0B924E28003B0451 /* adiumPurpleDnsRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B1268D0B924E28003B0451 /* adiumPurpleDnsRequest.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   614
		34B3247A0CE4CCF400158D5F /* PurpleAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B324780CE4CCF400158D5F /* PurpleAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   615
		34B3247B0CE4CCF400158D5F /* PurpleAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B324790CE4CCF400158D5F /* PurpleAccountViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   616
		34B4B5A40708B049002C4C6D /* ESDebugController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B4B5A20708B049002C4C6D /* ESDebugController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   617
		34B588A1058D833A00E7EF0D /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34B588A0058D833A00E7EF0D /* ExceptionHandling.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   618
		34B5E2600A7C94D3005186E6 /* AILogDateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B5E25E0A7C94D3005186E6 /* AILogDateFormatter.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   619
		34B9C7920A255DCE00CEA8AE /* LogViewerDateFilter.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B9C7910A255DCE00CEA8AE /* LogViewerDateFilter.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   620
		34BC8F7B0ACA3AAC00562745 /* AIScannerDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC8F790ACA3AAC00562745 /* AIScannerDebug.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   621
		34BD9D4A053146CC000AB133 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F59DB6AD033EB74801A8010A /* main.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   622
		34BD9D4C053146CC000AB133 /* AIContactInfoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A59903704B6101A8010A /* AIContactInfoWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   623
		34BD9D54053146CC000AB133 /* AIAdium.m in Sources */ = {isa = PBXBuildFile; fileRef = F59DB3D7033EA9CD01A8010A /* AIAdium.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   624
		34BD9D56053146CC000AB133 /* LNAboutBoxController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3DA2E3E052E65DE00A8010B /* LNAboutBoxController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   625
		34BD9D5A053146CC000AB133 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F531836F019E40BB01A80165 /* Carbon.framework */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   626
		34BFD7FD07E6A50C00AD984D /* msg-insert-script.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34BFD7FC07E6A50C00AD984D /* msg-insert-script.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   627
		34BFD80007E6A51D00AD984D /* GBApplescriptFiltersPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFD7FE07E6A51D00AD984D /* GBApplescriptFiltersPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   628
		34BFDF1807E8977D00AD984D /* SoundHigh.png in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDF1607E8977D00AD984D /* SoundHigh.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   629
		34BFDF1907E8977D00AD984D /* SoundLow.png in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDF1707E8977D00AD984D /* SoundLow.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   630
		34BFDF2007E8978900AD984D /* SendingKeyDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDF1E07E8978900AD984D /* SendingKeyDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   631
		34BFDF2107E8978900AD984D /* TabDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDF1F07E8978900AD984D /* TabDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   632
		34BFE20207E8E11500AD984D /* AIChatCyclingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFE20007E8E11500AD984D /* AIChatCyclingPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   633
		34BFE25007E8E5F200AD984D /* AIAutoLinkingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFE24E07E8E5F100AD984D /* AIAutoLinkingPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   634
		34BFE2D807E8E74400AD984D /* AIChatConsolidationPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFE2D607E8E74400AD984D /* AIChatConsolidationPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   635
		34C14CD307A8B1AB003CC138 /* AIEmoticonPackPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C14CD107A8B1AB003CC138 /* AIEmoticonPackPreviewView.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   636
		34C14D5107A8BA00003CC138 /* EmoticonPackPreview.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34C14D5007A8BA00003CC138 /* EmoticonPackPreview.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   637
		34C18B0D06CAC95400FF5FF9 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E839050583207E00F2AADB /* SystemConfiguration.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   638
		34C68B260778FA1300EB423C /* ESGeneralPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B240778FA1300EB423C /* ESGeneralPreferencesPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   639
		34C68B2C0778FA5C00EB423C /* ESGeneralPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B2A0778FA5C00EB423C /* ESGeneralPreferences.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   640
		34C6A3BC077A8CB500EB423C /* AppearanceDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34C6A3BB077A8CB500EB423C /* AppearanceDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   641
		34C7C62809EC4E890060FB4A /* AILibpurplePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B3244309BA003C00029361 /* AILibpurplePlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
2556
6acf6bdea9e8 We have to link against QuickTime and QTKit frameworks again since we're not using NSSound
Evan Schoenberg
parents: 2534
diff changeset
   642
		34C846AF101E515900140B4B /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34C846AE101E515900140B4B /* QTKit.framework */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   643
		34C899AC07E51B18009357F6 /* BuiltInEventPresets.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34C899AB07E51B18009357F6 /* BuiltInEventPresets.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   644
		34C91BBB0CA8909700740974 /* AIContentNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C91BB90CA8909700740974 /* AIContentNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   645
		34C91BBC0CA8909700740974 /* AIContentNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C91BBA0CA8909700740974 /* AIContentNotification.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   646
		34CA15530CAFDFB2009AA5E3 /* sidebarActionWidget.png in Resources */ = {isa = PBXBuildFile; fileRef = 34CA15520CAFDFB2009AA5E3 /* sidebarActionWidget.png */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   647
		34CA22300A671BEF00B11032 /* PersonalPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA222F0A671BEF00B11032 /* PersonalPreferences.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   648
		34CAA3FB0BD3998E00AE92DC /* ESPurpleAIMAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41C08086D9100E27095 /* ESPurpleAIMAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   649
		34CF9DF5085B8B7900D87E37 /* ESiTunesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   650
		34D073CA0B1E1A4400D63DF2 /* ESPurpleDotMacAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B387EB807199FE5004DE713 /* ESPurpleDotMacAccountViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   651
		34D073CB0B1E1A4500D63DF2 /* ESPurpleDotMacAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B387EB707199FE5004DE713 /* ESPurpleDotMacAccountViewController.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   652
		34D073CC0B1E1A4500D63DF2 /* ESPurpleDotMacAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F101E307342B4D00890D3B /* ESPurpleDotMacAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   653
		34D073CD0B1E1A4500D63DF2 /* ESPurpleDotMacAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F101E407342B4D00890D3B /* ESPurpleDotMacAccount.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   654
		34D073CE0B1E1A4500D63DF2 /* ESPurpleAIMAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EB8E07CD349200A82198 /* ESPurpleAIMAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   655
		34D073CF0B1E1A4500D63DF2 /* ESPurpleAIMAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E0EB8D07CD349200A82198 /* ESPurpleAIMAccount.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   656
		34D073D00B1E1A4500D63DF2 /* ESDotMacService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A406E00AD200FF7FBC /* ESDotMacService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   657
		34D073D10B1E1A4500D63DF2 /* ESDotMacService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD5A306E00AD200FF7FBC /* ESDotMacService.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   658
		34D073D20B1E1A4500D63DF2 /* ESAIMService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A206E00AD200FF7FBC /* ESAIMService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   659
		34D073D30B1E1A4500D63DF2 /* ESAIMService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD5A106E00AD200FF7FBC /* ESAIMService.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   660
		34D073D60B1E1A5000D63DF2 /* PurpleDefaultsMac.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76472E07A07A340021CCD7 /* PurpleDefaultsMac.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   661
		34D073D70B1E1A5000D63DF2 /* PurpleDefaultsAIM.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7635A507A0581D0021CCD7 /* PurpleDefaultsAIM.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   662
		34D0F9CB0954E70100DCB678 /* AIContactListImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0F9C90954E70100DCB678 /* AIContactListImagePicker.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   663
		34D0FDD20956186200DCB678 /* ESPersonalPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   664
		34D0FDD80956187700DCB678 /* ESPersonalPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   665
		34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */; };
5039
68bb3f77b1d0 Tab switching now defaults to ctrl+tab, matching Safari's user visible default, as per discussion on IRC today. This only applies to new users as of Adium 1.5.4 and later; anyone who has run a previous version will inherit the keep the old default of command+arrows (unless they've changed it previously, of course). Fixes #16102.
Evan Schoenberg
parents: 5032
diff changeset
   666
		34D7F1EA15F85DD300F32F9B /* ChatCyclingDefaults-Old.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */; };
68bb3f77b1d0 Tab switching now defaults to ctrl+tab, matching Safari's user visible default, as per discussion on IRC today. This only applies to new users as of Adium 1.5.4 and later; anyone who has run a previous version will inherit the keep the old default of command+arrows (unless they've changed it previously, of course). Fixes #16102.
Evan Schoenberg
parents: 5032
diff changeset
   667
		34D7F1EB15F85DD300F32F9B /* ChatCyclingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */; };
4010
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   668
		34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   669
		34D8153B13B663650022C8C4 /* AIFacebookXMPPAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   670
		34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   671
		34D8153E13B663650022C8C4 /* AIFacebookXMPPAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153413B663650022C8C4 /* AIFacebookXMPPAccountViewController.m */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   672
		34D8153F13B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D8153513B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   673
		34D8154013B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153613B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.h */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   674
		34D8154113B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153713B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   675
		34D8154213B663650022C8C4 /* AIFacebookXMPPService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153813B663650022C8C4 /* AIFacebookXMPPService.h */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   676
		34D8154313B663650022C8C4 /* AIFacebookXMPPService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   677
		34D8154613B663700022C8C4 /* JSONKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154413B663700022C8C4 /* JSONKit.h */; };
4619
86516af48d97 Added -DNS_BLOCK_ASSERTIONS to JSONKit to improve performance.
Adrian Godoroja <robotive@me.com>
parents: 4612
diff changeset
   678
		34D8154713B663700022C8C4 /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154513B663700022C8C4 /* JSONKit.m */; settings = {COMPILER_FLAGS = "-DNS_BLOCK_ASSERTIONS"; }; };
4010
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   679
		34D8154D13B663A80022C8C4 /* auth_fb.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154913B663A80022C8C4 /* auth_fb.c */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   680
		34D8154E13B663A80022C8C4 /* auth_fb.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154A13B663A80022C8C4 /* auth_fb.h */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   681
		34D8154F13B663A80022C8C4 /* fbapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154B13B663A80022C8C4 /* fbapi.c */; };
2d2df07686e3 Further project work
Evan Schoenberg
parents: 4007
diff changeset
   682
		34D8155013B663A80022C8C4 /* fbapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154C13B663A80022C8C4 /* fbapi.h */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   683
		34D832A007CBD61A006466F2 /* ContactListDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8329F07CBD61A006466F2 /* ContactListDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   684
		34D832AE07CBD62C006466F2 /* AdiumEmoticonset.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832A507CBD62B006466F2 /* AdiumEmoticonset.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   685
		34D832AF07CBD62C006466F2 /* AdiumScripts.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832A607CBD62B006466F2 /* AdiumScripts.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   686
		34D832B007CBD62C006466F2 /* AdiumMessageStyle.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832A707CBD62B006466F2 /* AdiumMessageStyle.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   687
		34D832B107CBD62C006466F2 /* AdiumListTheme.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832A807CBD62B006466F2 /* AdiumListTheme.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   688
		34D832B207CBD62C006466F2 /* AdiumListLayout.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832A907CBD62C006466F2 /* AdiumListLayout.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   689
		34D832B307CBD62C006466F2 /* AdiumSoundset.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832AA07CBD62C006466F2 /* AdiumSoundset.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   690
		34D832B407CBD62C006466F2 /* AdiumIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832AB07CBD62C006466F2 /* AdiumIcon.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   691
		34D832B507CBD62C006466F2 /* AdiumPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832AC07CBD62C006466F2 /* AdiumPlugin.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   692
		34D832B607CBD62C006466F2 /* Adium.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832AD07CBD62C006466F2 /* Adium.icns */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   693
		34D8332B07CBD72A006466F2 /* ContactCountingDisplayDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8332A07CBD72A006466F2 /* ContactCountingDisplayDefaults.plist */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   694
		34D8333207CBD741006466F2 /* ApplescriptContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333007CBD741006466F2 /* ApplescriptContactAlert.nib */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   695
		34D8333307CBD741006466F2 /* events-applescript-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333107CBD741006466F2 /* events-applescript-alert.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   696
		34D8333B07CBD758006466F2 /* ESApplescriptContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333707CBD758006466F2 /* ESApplescriptContactAlertPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   697
		34D8333C07CBD758006466F2 /* ESPanelApplescriptDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333807CBD758006466F2 /* ESPanelApplescriptDetailPane.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   698
		34D8337107CBD808006466F2 /* pref-general.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336807CBD807006466F2 /* pref-general.tif */; };
4712
0b511a094a1e Fix oops
Robert Vehse
parents: 4707
diff changeset
   699
		34D8337407CBD808006466F2 /* pref-file-transfer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336B07CBD807006466F2 /* pref-file-transfer.tiff */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   700
		34D8337507CBD808006466F2 /* pref-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336C07CBD807006466F2 /* pref-events.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
   701
		34D8337707CBD808006466F2 /* pref-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336E07CBD807006466F2 /* pref-advanced.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   702
		34D836E507CBF593006466F2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F531836F019E40BB01A80165 /* Carbon.framework */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   703
		34DC12FC0A81415D00D710F3 /* ESApplescriptabilityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344C0D4E06B6D63800DA7200 /* ESApplescriptabilityController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   704
		34DC13040A81417600D710F3 /* AILoginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938C2033E73AC01A8010A /* AILoginWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   705
		34DC13050A81417700D710F3 /* LoginSelect.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E3407CBA7DF004A4FFF /* LoginSelect.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   706
		34DC88140A7EEE2E003E1636 /* AIAccountController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AA033E737001A8010A /* AIAccountController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   707
		34DC88160A7EEE2E003E1636 /* AIContactController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AB033E737001A8010A /* AIContactController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   708
		34DC88180A7EEE2E003E1636 /* ESContactAlertsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF42678057763E200F27FAA /* ESContactAlertsController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   709
		34DC881A0A7EEE2E003E1636 /* AIDockController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E95316903C8E0C700415B22 /* AIDockController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   710
		34DC881C0A7EEE2E003E1636 /* AIInterfaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AC033E737001A8010A /* AIInterfaceController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   711
		34DC881E0A7EEE2E003E1636 /* AIMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A5B603704C6101A8010A /* AIMenuController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   712
		34DC88200A7EEE2E003E1636 /* AISoundController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938B0033E737001A8010A /* AISoundController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   713
		34DC88220A7EEE2E003E1636 /* AIToolbarController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A60803704E9701A8010A /* AIToolbarController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   714
		34DC88240A7EEE2E003E1636 /* AIChatController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B82C80085A85D800864531 /* AIChatController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   715
		34DC88260A7EEE2E003E1636 /* AIContentController.m in Sources */ = {isa = PBXBuildFile; fileRef = F55B415D03AB8B5601A8010A /* AIContentController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   716
		34DC88280A7EEE2E003E1636 /* AIEmoticonController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C157D904A88E04008E0C76 /* AIEmoticonController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   717
		34DC882A0A7EEE2E003E1636 /* AIStatusController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B292D3107A9C8E100C5F882 /* AIStatusController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   718
		34DC882C0A7EEE2E003E1636 /* ESFileTransferController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34FDD6E405632BFD00F5B30F /* ESFileTransferController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   719
		34DC882E0A7EEE2E003E1636 /* AILoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AD033E737001A8010A /* AILoginController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   720
		34DC88300A7EEE2E003E1636 /* AIPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AF033E737001A8010A /* AIPreferenceController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   721
		34DC88320A7EEE2E003E1636 /* AICoreComponentLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B0149060733D3A5001A4C57 /* AICoreComponentLoader.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   722
		34DC88340A7EEE2E003E1636 /* AdiumAccounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE40C1F0846544000F5790F /* AdiumAccounts.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   723
		34DC88360A7EEE2E003E1636 /* AdiumPasswords.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B8742490840E3D800738987 /* AdiumPasswords.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   724
		34DC883A0A7EEE2E003E1636 /* ESAccountPasswordPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3420E65C0611D80000AE67E3 /* ESAccountPasswordPromptController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   725
		34DC883C0A7EEE2E003E1636 /* ESProxyPasswordPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3420E65E0611D80000AE67E3 /* ESProxyPasswordPromptController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   726
		34DC88410A7EEE2E003E1636 /* AdiumPreferredAccounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE3AD1D085F3EDD005919E7 /* AdiumPreferredAccounts.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   727
		34DC88430A7EEE2E003E1636 /* AdiumServices.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B8741D20840D25600738987 /* AdiumServices.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   728
		34DC88450A7EEE2E003E1636 /* AdiumApplescriptRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E1EDF40A045AA2003C14F1 /* AdiumApplescriptRunner.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   729
		34DC884C0A7EEE2E003E1636 /* AdiumContentFiltering.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC5418F08649CC6003CD69E /* AdiumContentFiltering.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   730
		34DC884E0A7EEE2E003E1636 /* AdiumFormatting.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC540B708648322003CD69E /* AdiumFormatting.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   731
		34DC884F0A7EEE2E003E1636 /* FormattingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB8007D6FDCC00972830 /* FormattingDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   732
		34DC88510A7EEE2E003E1636 /* AdiumTyping.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDAB9920861C661009FB73B /* AdiumTyping.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   733
		34DC88530A7EEE2E003E1636 /* AdiumMessageEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B82C8A085A87B000864531 /* AdiumMessageEvents.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   734
		34DC88550A7EEE2E003E1636 /* AdiumChatEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BD0DB408D31479000BE2C0 /* AdiumChatEvents.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   735
		34DC88570A7EEE2E003E1636 /* ESFileTransferRequestPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3452A9F707891C8A00C3C494 /* ESFileTransferRequestPromptController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   736
		34DC88580A7EEE2E003E1636 /* FileTransferRequestPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2A07CBA70D004A4FFF /* FileTransferRequestPrompt.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   737
		34DC88590A7EEE2E003E1636 /* FileTransferProgressWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2B07CBA70D004A4FFF /* FileTransferProgressWindow.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   738
		34DC885A0A7EEE2E003E1636 /* FileTransferPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2C07CBA70D004A4FFF /* FileTransferPrefs.plist */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   739
		34DC885B0A7EEE2E003E1636 /* FileTransferPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2D07CBA70D004A4FFF /* FileTransferPrefs.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   740
		34DC885D0A7EEE2E003E1636 /* ESFileTransferProgressRow.m in Sources */ = {isa = PBXBuildFile; fileRef = 349FE300074D01D300E36B3B /* ESFileTransferProgressRow.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   741
		34DC885F0A7EEE2E003E1636 /* ESFileTransferProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 349FE2FE074D01D300E36B3B /* ESFileTransferProgressView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   742
		34DC88620A7EEE2F003E1636 /* ESFileTransferProgressWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349FE2FC074D01D200E36B3B /* ESFileTransferProgressWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   743
		34DC88640A7EEE2F003E1636 /* ESFileTransferPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D2E8680758BB0B0054C56D /* ESFileTransferPreferences.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   744
		34DC88650A7EEE2F003E1636 /* FTProgressRevealRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324807CBD53A006466F2 /* FTProgressRevealRollover.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   745
		34DC88660A7EEE2F003E1636 /* FTProgressRevealRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324907CBD53A006466F2 /* FTProgressRevealRollover_Selected.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   746
		34DC88670A7EEE2F003E1636 /* FTProgressStopRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324A07CBD53A006466F2 /* FTProgressStopRollover_Selected.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   747
		34DC88680A7EEE2F003E1636 /* FTProgressStop_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324B07CBD53A006466F2 /* FTProgressStop_Selected.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   748
		34DC88690A7EEE2F003E1636 /* FTProgressStop.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324C07CBD53A006466F2 /* FTProgressStop.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   749
		34DC886A0A7EEE2F003E1636 /* FTProgressStopRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324D07CBD53B006466F2 /* FTProgressStopRollover.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   750
		34DC886B0A7EEE2F003E1636 /* FTProgressRevealPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324E07CBD53B006466F2 /* FTProgressRevealPressed.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   751
		34DC886C0A7EEE2F003E1636 /* FTProgressReveal_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324F07CBD53B006466F2 /* FTProgressReveal_Selected.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   752
		34DC886D0A7EEE2F003E1636 /* FTProgressReveal.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325007CBD53B006466F2 /* FTProgressReveal.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   753
		34DC886E0A7EEE2F003E1636 /* FTProgressStopPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325107CBD53B006466F2 /* FTProgressStopPressed_Selected.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   754
		34DC886F0A7EEE2F003E1636 /* FTProgressStopPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325207CBD53B006466F2 /* FTProgressStopPressed.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   755
		34DC88700A7EEE2F003E1636 /* FTProgressRevealPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325307CBD53B006466F2 /* FTProgressRevealPressed_Selected.tif */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   756
		34DC88740A7EEE2F003E1636 /* AIPreferenceWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938BB033E739101A8010A /* AIPreferenceWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   757
		34DC88770A7EEE2F003E1636 /* AdiumSetupWizard.m in Sources */ = {isa = PBXBuildFile; fileRef = 344161BC0943E0D800BC26ED /* AdiumSetupWizard.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   758
		34DC88780A7EEE2F003E1636 /* AdiumyButler.png in Resources */ = {isa = PBXBuildFile; fileRef = 344161CF0943E20D00BC26ED /* AdiumyButler.png */; };
4298
7980394fb632 Removed Fire import from Setup Wizard and File menu. Converted SetupWizard to
Patrick Steinhardt <steinhardt.p@me.com>
parents: 4297
diff changeset
   759
		34DC88790A7EEE2F003E1636 /* SetupWizard.xib in Resources */ = {isa = PBXBuildFile; fileRef = 344161D30943E22F00BC26ED /* SetupWizard.xib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   760
		34DC887B0A7EEE2F003E1636 /* SetupWizardBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3441623F0943E76400BC26ED /* SetupWizardBackgroundView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   761
		34DC887D0A7EEE2F003E1636 /* AdiumSound.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B14CF25085FBC5800C88949 /* AdiumSound.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   762
		34DC887F0A7EEE2F003E1636 /* AdiumSoundSets.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B14CF27085FBC5900C88949 /* AdiumSoundSets.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   763
		34DC88810A7EEE2F003E1636 /* AdiumSpeech.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B14CF29085FBC5900C88949 /* AdiumSpeech.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   764
		34DC88820A7EEE2F003E1636 /* SoundPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326407CBD598006466F2 /* SoundPrefs.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   765
		34DC88840A7EEE2F003E1636 /* AdiumIdleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 346CFDC5087B7836009711C8 /* AdiumIdleManager.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   766
		34DC88880A7EEE2F003E1636 /* XtrasInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F10239073449D500890D3B /* XtrasInstaller.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   767
		34DC88890A7EEE2F003E1636 /* XtraProgressWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F1022A0734499600890D3B /* XtraProgressWindow.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   768
		34DC8A440A7EEEF7003E1636 /* AIApplescriptabilityControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0EB90A7E83D70059A3AF /* AIApplescriptabilityControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   769
		34DC8A450A7EEEF7003E1636 /* AIControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D03A80A7D798A0059A3AF /* AIControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   770
		34DC8A460A7EEEF7003E1636 /* AIAccountControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D03990A7D78FC0059A3AF /* AIAccountControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   771
		34DC8A470A7EEEF7003E1636 /* AIChatControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D081F0A7DBFE40059A3AF /* AIChatControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   772
		34DC8A480A7EEEF7003E1636 /* AIContactAlertsControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D083F0A7DC1540059A3AF /* AIContactAlertsControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   773
		34DC8A490A7EEEF7003E1636 /* AIContactControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0D5B0A7E72030059A3AF /* AIContactControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   774
		34DC8A4A0A7EEEF7003E1636 /* AIContentControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0D630A7E72DA0059A3AF /* AIContentControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   775
		34DC8A4B0A7EEEF7003E1636 /* AIDockControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0D720A7E750E0059A3AF /* AIDockControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   776
		34DC8A4C0A7EEEF7003E1636 /* AIEmoticonControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0DA90A7E76480059A3AF /* AIEmoticonControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   777
		34DC8A4D0A7EEEF7003E1636 /* AIFileTransferControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0DC50A7E76DA0059A3AF /* AIFileTransferControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   778
		34DC8A4E0A7EEEF7003E1636 /* AIInterfaceControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0DFF0A7E7B090059A3AF /* AIInterfaceControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   779
		34DC8A4F0A7EEEF7003E1636 /* AILoginControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0E190A7E7DC30059A3AF /* AILoginControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   780
		34DC8A500A7EEEF7003E1636 /* AIMenuControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0E1D0A7E7E7B0059A3AF /* AIMenuControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   781
		34DC8A510A7EEEF7003E1636 /* AIPreferenceControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0E210A7E7F160059A3AF /* AIPreferenceControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   782
		34DC8A520A7EEEF7003E1636 /* AISoundControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0E8A0A7E80000059A3AF /* AISoundControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   783
		34DC8A530A7EEEF7003E1636 /* AIStatusControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0EA90A7E826C0059A3AF /* AIStatusControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   784
		34DC8A540A7EEEF7003E1636 /* AIToolbarControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0EAF0A7E82F70059A3AF /* AIToolbarControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   785
		34DC8A550A7EEEF7003E1636 /* AIDebugControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0EC20A7E84680059A3AF /* AIDebugControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   786
		34DC8A570A7EEEF7003E1636 /* ESPresetManagementController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BFD7F207E6A22700AD984D /* ESPresetManagementController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   787
		34DC8A580A7EEEF7003E1636 /* ESPresetManagementController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFD7F407E6A22700AD984D /* ESPresetManagementController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   788
		34DC8A590A7EEEF7003E1636 /* PresetManagement.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34BFD7F307E6A22700AD984D /* PresetManagement.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   789
		34DC8A5A0A7EEEF7003E1636 /* ESPresetNameSheetController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BFDB2C07E7710C00AD984D /* ESPresetNameSheetController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   790
		34DC8A5B0A7EEEF7003E1636 /* ESPresetNameSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFDB2D07E7710C00AD984D /* ESPresetNameSheetController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   791
		34DC8A5C0A7EEEF7003E1636 /* PresetNameSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDB3807E7714200AD984D /* PresetNameSheet.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   792
		34DC8A5D0A7EEEF7003E1636 /* AIService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD57706E0091100FF7FBC /* AIService.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   793
		34DC8A5E0A7EEEF7003E1636 /* AIService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD57806E0091100FF7FBC /* AIService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   794
		34DC8A5F0A7EEEF7003E1636 /* AIAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = F5793922033E74C301A8010A /* AIAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   795
		34DC8A600A7EEEF7003E1636 /* AIAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = F579390B033E748F01A8010A /* AIAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   796
		34DC8A610A7EEEF7003E1636 /* AIAbstractAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE8AF6D0796EC1200B6E49B /* AIAbstractAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   797
		34DC8A620A7EEEF7003E1636 /* AIAbstractAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE8AF6E0796EC1200B6E49B /* AIAbstractAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   798
		34DC8A630A7EEEF7003E1636 /* AIAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B28DDAB0599FED200343093 /* AIAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   799
		34DC8A640A7EEEF7003E1636 /* AIAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B28DDAC0599FED200343093 /* AIAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   800
		34DC8A650A7EEEF7003E1636 /* AccountSetup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E907A0B6D30057DB2C /* AccountSetup.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   801
		34DC8A660A7EEEF7003E1636 /* AccountProfile.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E807A0B6D30057DB2C /* AccountProfile.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   802
		34DC8A670A7EEEF7003E1636 /* AccountOptions.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E707A0B6D30057DB2C /* AccountOptions.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   803
		34DC8A680A7EEEF7003E1636 /* AccountPrivacy.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34943DEE07BAD918000F2A03 /* AccountPrivacy.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   804
		34DC8A690A7EEEF7003E1636 /* AccountDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 348FF84909128D6300A942A8 /* AccountDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   805
		34DC8A6A0A7EEEF7003E1636 /* AIEmoticon.h in Headers */ = {isa = PBXBuildFile; fileRef = 34503C7F058F96C400FB7AD1 /* AIEmoticon.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   806
		34DC8A6B0A7EEEF7003E1636 /* AIEmoticon.m in Sources */ = {isa = PBXBuildFile; fileRef = 34503C7E058F96C400FB7AD1 /* AIEmoticon.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   807
		34DC8A6C0A7EEEF7003E1636 /* AIEmoticonPack.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C73F83E04D62A2900A80106 /* AIEmoticonPack.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   808
		34DC8A6D0A7EEEF7003E1636 /* AIEmoticonPack.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C73F83F04D62A2900A80106 /* AIEmoticonPack.m */; };
4023
bfce6775ab4c Fixed Target errors for AIStatusDefines and AIFontAdditions introduced in r4021 (f5412548f2f3).
Patrick Steinhardt <steinhardt.p@me.com>
parents: 4021
diff changeset
   809
		34DC8A6E0A7EEEF7003E1636 /* AIStatusDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B87D760A3A9FCF00A38283 /* AIStatusDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   810
		34DC8A6F0A7EEEF7003E1636 /* AIStatusItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 348F50C00935317C00288E41 /* AIStatusItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   811
		34DC8A700A7EEEF7003E1636 /* AIStatusItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 348F50C10935317C00288E41 /* AIStatusItem.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   812
		34DC8A710A7EEEF7003E1636 /* AIStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AC36B907B5C51400145239 /* AIStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   813
		34DC8A720A7EEEF7003E1636 /* AIStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC36BA07B5C51400145239 /* AIStatus.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   814
		34DC8A730A7EEEF7003E1636 /* AIStatusGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AC2FA509352C2400393D7A /* AIStatusGroup.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   815
		34DC8A740A7EEEF7003E1636 /* AIStatusGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC2FA609352C2400393D7A /* AIStatusGroup.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   816
		34DC8A750A7EEEF7003E1636 /* AIEditStateWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B588C9B07AC23B2001832A9 /* AIEditStateWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   817
		34DC8A760A7EEEF7003E1636 /* AIEditStateWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B588C9C07AC23B2001832A9 /* AIEditStateWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   818
		34DC8A770A7EEEF7003E1636 /* EditStateSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 342114B40826D37100A3B0FB /* EditStateSheet.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   819
		34DC8A790A7EEEF7003E1636 /* AIAbstractListObjectMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B22E15C085CAE2E001864DE /* AIAbstractListObjectMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   820
		34DC8A7A0A7EEEF7003E1636 /* AIAbstractListObjectMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B22E15D085CAE2F001864DE /* AIAbstractListObjectMenu.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   821
		34DC8A7B0A7EEEF7003E1636 /* AIAccountMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 3449485B08E9FCD60054FF57 /* AIAccountMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   822
		34DC8A7C0A7EEEF7003E1636 /* AIAccountMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 3449485A08E9FCD60054FF57 /* AIAccountMenu.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   823
		34DC8A7D0A7EEEF7003E1636 /* AIContactMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 3449485608E9FCCD0054FF57 /* AIContactMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   824
		34DC8A7E0A7EEEF7003E1636 /* AIContactMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 3449485508E9FCCD0054FF57 /* AIContactMenu.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   825
		34DC8A7F0A7EEEF7003E1636 /* AIServiceMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAF8CFC083D9A2A0067CF6F /* AIServiceMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   826
		34DC8A800A7EEEF7003E1636 /* AIServiceMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAF8CFD083D9A2A0067CF6F /* AIServiceMenu.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   827
		34DC8A810A7EEEF7003E1636 /* AIStatusMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AC2E9F0934FAE100393D7A /* AIStatusMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   828
		34DC8A820A7EEEF7003E1636 /* AIStatusMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC2EA00934FAE100393D7A /* AIStatusMenu.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   829
		34DC8A830A7EEEF7003E1636 /* ESTextAndButtonsWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E00F7407B92B2E000DF265 /* ESTextAndButtonsWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   830
		34DC8A840A7EEEF7003E1636 /* ESTextAndButtonsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E00F7507B92B2F000DF265 /* ESTextAndButtonsWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   831
		34DC8A850A7EEEF7003E1636 /* TextAndButtonsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34E00F8607B92B88000DF265 /* TextAndButtonsWindow.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   832
		34DC8A860A7EEEF7003E1636 /* AIWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BFC3412058D48A8008F7FA2 /* AIWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   833
		34DC8A870A7EEEF7003E1636 /* AIWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BFC3413058D48A8008F7FA2 /* AIWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   834
		34DC8A880A7EEEF7003E1636 /* AICorePluginLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 340BA84409EC593A000EC441 /* AICorePluginLoader.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   835
		34DC8A890A7EEEF7003E1636 /* AICorePluginLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 340BA84509EC593B000EC441 /* AICorePluginLoader.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   836
		34DC8A8A0A7EEEF7003E1636 /* ESDebugAILog.h in Headers */ = {isa = PBXBuildFile; fileRef = 3448054F07AC5151006A7F7B /* ESDebugAILog.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   837
		34DC8A8B0A7EEEF7003E1636 /* ESDebugAILog.m in Sources */ = {isa = PBXBuildFile; fileRef = 3448054E07AC5151006A7F7B /* ESDebugAILog.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   838
		34DC8A8E0A7EEEF7003E1636 /* AISoundSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD548AE086086B5008DF3CB /* AISoundSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   839
		34DC8A8F0A7EEEF7003E1636 /* AISoundSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD548AF086086B5008DF3CB /* AISoundSet.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   840
		34DC8A900A7EEEF7003E1636 /* AIToolbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E6D38E0727354600A2643A /* AIToolbar.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   841
		34DC8A910A7EEEF7003E1636 /* AIToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E6D38F0727354600A2643A /* AIToolbar.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   842
		34DC8A920A7EEEF7003E1636 /* AIColorPickerSliders.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D369ED08E7544D00E15E40 /* AIColorPickerSliders.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   843
		34DC8A930A7EEEF7003E1636 /* AIColorPickerSliders.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D369EE08E7544D00E15E40 /* AIColorPickerSliders.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   844
		34DC8A940A7EEEF7003E1636 /* AIPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9CF854080F9784000C5249 /* AIPathUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   845
		34DC8A950A7EEEF7003E1636 /* AIPathUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9CF855080F9784000C5249 /* AIPathUtilities.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   846
		34DC8A960A7EEEF7003E1636 /* AISortController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B422C0905ACB248005E720B /* AISortController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   847
		34DC8A970A7EEEF7003E1636 /* AISortController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B422C0A05ACB248005E720B /* AISortController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   848
		34DC8A980A7EEEF7003E1636 /* ESObjectWithProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 34111A5D06BE1B370005AF5C /* ESObjectWithProperties.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   849
		34DC8A990A7EEEF7003E1636 /* ESObjectWithProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 34111A5E06BE1B370005AF5C /* ESObjectWithProperties.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   850
		34DC8A9A0A7EEEF7003E1636 /* AIChat.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B82138E049CA6CC00A8010A /* AIChat.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   851
		34DC8A9B0A7EEEF7003E1636 /* AIChat.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B82138F049CA6CC00A8010A /* AIChat.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   852
		34DC8A9C0A7EEEF7003E1636 /* AIListObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF5BA14042F3CB200A8010A /* AIListObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   853
		34DC8A9D0A7EEEF7003E1636 /* AIListObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5BA15042F3CB200A8010A /* AIListObject.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   854
		34DC8A9E0A7EEEF7003E1636 /* AIListGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF5BA12042F3CB200A8010A /* AIListGroup.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   855
		34DC8A9F0A7EEEF7003E1636 /* AIListGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5BA13042F3CB200A8010A /* AIListGroup.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   856
		34DC8AA00A7EEEF7003E1636 /* AIListContact.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF5BA10042F3CB200A8010A /* AIListContact.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   857
		34DC8AA10A7EEEF7003E1636 /* AIListContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5BA11042F3CB200A8010A /* AIListContact.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   858
		34DC8AA20A7EEEF7003E1636 /* AIMetaContact.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B09D5C005D5265800BC00F0 /* AIMetaContact.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   859
		34DC8AA30A7EEEF7003E1636 /* AIMetaContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B09D5C105D5265800BC00F0 /* AIMetaContact.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   860
		34DC8AA40A7EEEF7003E1636 /* AIImageTextCellView.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C69E6D07794B9200EB423C /* AIImageTextCellView.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   861
		34DC8AA50A7EEEF7003E1636 /* AIImageTextCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C69E6E07794B9200EB423C /* AIImageTextCellView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   862
		34DC8AA60A7EEEF7003E1636 /* ESContactAlertsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B7033E076EDB370016E8BA /* ESContactAlertsViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   863
		34DC8AA70A7EEEF7003E1636 /* ESContactAlertsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B7033D076EDB370016E8BA /* ESContactAlertsViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   864
		34DC8AA80A7EEEF7003E1636 /* CSNewContactAlertWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B70340076EDB370016E8BA /* CSNewContactAlertWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   865
		34DC8AA90A7EEEF7003E1636 /* CSNewContactAlertWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B7033F076EDB370016E8BA /* CSNewContactAlertWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   866
		34DC8AAA0A7EEEF7003E1636 /* NewAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B70341076EDB370016E8BA /* NewAlert.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   867
		34DC8AAB0A7EEEF7003E1636 /* NewAlertNoEvents.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BFE2E9F07E61A4E00C07EBE /* NewAlertNoEvents.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   868
		34DC8AAC0A7EEEF7003E1636 /* AIAbstractListController.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F440306D8202A0072E2FA /* AIAbstractListController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   869
		34DC8AAD0A7EEEF7003E1636 /* AIAbstractListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F440406D8202A0072E2FA /* AIAbstractListController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   870
		34DC8AAE0A7EEEF7003E1636 /* AIListOutlineView.h in Headers */ = {isa = PBXBuildFile; fileRef = 34A48AD206F647FD002C7C5F /* AIListOutlineView.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   871
		34DC8AAF0A7EEEF7003E1636 /* AIListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48AD106F647FD002C7C5F /* AIListOutlineView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   872
		34DC8AB00A7EEEF7003E1636 /* AIUserIcons.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B93588A06DBC71B007977AA /* AIUserIcons.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   873
		34DC8AB10A7EEEF7003E1636 /* AIUserIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B93588E06DBC71B007977AA /* AIUserIcons.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   874
		34DC8AB20A7EEEF7003E1636 /* AIStatusIcons.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B93588F06DBC71B007977AA /* AIStatusIcons.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   875
		34DC8AB30A7EEEF7003E1636 /* AIStatusIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B93588B06DBC71B007977AA /* AIStatusIcons.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   876
		34DC8AB40A7EEEF7003E1636 /* DefaultBlockedStatusIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C9EC40099FA2A8007ECAB3 /* DefaultBlockedStatusIcon.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   877
		34DC8AB50A7EEEF7003E1636 /* AIServiceIcons.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B93588D06DBC71B007977AA /* AIServiceIcons.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   878
		34DC8AB60A7EEEF7003E1636 /* AIServiceIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B93588C06DBC71B007977AA /* AIServiceIcons.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   879
		34DC8AB70A7EEEF7003E1636 /* AIListCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F485106DA5E060072E2FA /* AIListCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   880
		34DC8AB80A7EEEF7003E1636 /* AIListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F485006DA5E060072E2FA /* AIListCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   881
		34DC8AB90A7EEEF7003E1636 /* AIListContactCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F485D06DA5E1E0072E2FA /* AIListContactCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   882
		34DC8ABA0A7EEEF7003E1636 /* AIListContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F485E06DA5E1E0072E2FA /* AIListContactCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   883
		34DC8ABB0A7EEEF7003E1636 /* AIListContactMockieCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F486106DA5E1F0072E2FA /* AIListContactMockieCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   884
		34DC8ABC0A7EEEF7003E1636 /* AIListContactMockieCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F486006DA5E1F0072E2FA /* AIListContactMockieCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   885
		34DC8ABD0A7EEEF7003E1636 /* AIListContactBubbleCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F486406DA5E1F0072E2FA /* AIListContactBubbleCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   886
		34DC8ABE0A7EEEF7003E1636 /* AIListContactBubbleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F486306DA5E1F0072E2FA /* AIListContactBubbleCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   887
		34DC8ABF0A7EEEF7003E1636 /* AIListContactBubbleToFitCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F486206DA5E1F0072E2FA /* AIListContactBubbleToFitCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   888
		34DC8AC00A7EEEF7003E1636 /* AIListContactBubbleToFitCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F485F06DA5E1F0072E2FA /* AIListContactBubbleToFitCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   889
		34DC8AC10A7EEEF7003E1636 /* AIListGroupCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F487F06DA5E440072E2FA /* AIListGroupCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   890
		34DC8AC20A7EEEF7003E1636 /* AIListGroupCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F487B06DA5E440072E2FA /* AIListGroupCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   891
		34DC8AC30A7EEEF7003E1636 /* AIListGroupMockieCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F487706DA5E440072E2FA /* AIListGroupMockieCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   892
		34DC8AC40A7EEEF7003E1636 /* AIListGroupMockieCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F487806DA5E440072E2FA /* AIListGroupMockieCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   893
		34DC8AC50A7EEEF7003E1636 /* AIListGroupBubbleCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F487A06DA5E440072E2FA /* AIListGroupBubbleCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   894
		34DC8AC60A7EEEF7003E1636 /* AIListGroupBubbleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F487E06DA5E440072E2FA /* AIListGroupBubbleCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   895
		34DC8AC70A7EEEF7003E1636 /* AIListGroupBubbleToFitCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F487D06DA5E440072E2FA /* AIListGroupBubbleToFitCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   896
		34DC8AC80A7EEEF7003E1636 /* AIListGroupBubbleToFitCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F487C06DA5E440072E2FA /* AIListGroupBubbleToFitCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   897
		34DC8AC90A7EEEF7003E1636 /* AIContentObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B82139D049CC3A000A8010A /* AIContentObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   898
		34DC8ACA0A7EEEF7003E1636 /* AIContentObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B82139E049CC3A000A8010A /* AIContentObject.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   899
		34DC8ACB0A7EEEF7003E1636 /* AIContentContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 6ECFABC606223733001C7E93 /* AIContentContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   900
		34DC8ACC0A7EEEF7003E1636 /* AIContentContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECFABC706223733001C7E93 /* AIContentContext.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   901
		34DC8ACD0A7EEEF7003E1636 /* AIContentMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = F579392B033E74C401A8010A /* AIContentMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   902
		34DC8ACE0A7EEEF7003E1636 /* AIContentMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793911033E748F01A8010A /* AIContentMessage.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   903
		34DC8ACF0A7EEEF7003E1636 /* AIContentStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BFC5407043E509A00A8010A /* AIContentStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   904
		34DC8AD00A7EEEF7003E1636 /* AIContentStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BFC5408043E509A00A8010A /* AIContentStatus.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   905
		34DC8AD10A7EEEF7003E1636 /* AIContentTyping.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDC17720493C90E00A8010A /* AIContentTyping.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   906
		34DC8AD20A7EEEF7003E1636 /* AIContentTyping.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDC17730493C90E00A8010A /* AIContentTyping.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   907
		34DC8AD30A7EEEF7003E1636 /* AIContentEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 349B39290A5FB150008BE092 /* AIContentEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   908
		34DC8AD40A7EEEF7003E1636 /* AIContentEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 349B392A0A5FB150008BE092 /* AIContentEvent.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   909
		34DC8AD50A7EEEF7003E1636 /* DCJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D960606B73979005235E9 /* DCJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   910
		34DC8AD60A7EEEF7003E1636 /* DCJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D960706B73979005235E9 /* DCJoinChatViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   911
		34DC8AD70A7EEEF7003E1636 /* DCJoinChatWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D960806B7397A005235E9 /* DCJoinChatWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   912
		34DC8AD80A7EEEF7003E1636 /* DCJoinChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D960906B7397A005235E9 /* DCJoinChatWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   913
		34DC8AD90A7EEEF7003E1636 /* JoinChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D960A06B7397A005235E9 /* JoinChatWindow.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   914
		34DC8ADA0A7EEEF7003E1636 /* AIAccountPlusFieldPromptController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E829820766B0FE00EFB3BC /* AIAccountPlusFieldPromptController.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   915
		34DC8ADB0A7EEEF7003E1636 /* AIAccountPlusFieldPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E829830766B0FE00EFB3BC /* AIAccountPlusFieldPromptController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   916
		34DC8ADC0A7EEEF7003E1636 /* AIContextMenuTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E1E8176063A3EEC00EB00F7 /* AIContextMenuTextView.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   917
		34DC8ADD0A7EEEF7003E1636 /* AIContextMenuTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E1E8177063A3EEC00EB00F7 /* AIContextMenuTextView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   918
		34DC8AE00A7EEEF7003E1636 /* AIMessageEntryTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B5827E80613CE9D0004BD25 /* AIMessageEntryTextView.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   919
		34DC8AE10A7EEEF7003E1636 /* AIMessageEntryTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5827E90613CE9D0004BD25 /* AIMessageEntryTextView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   920
		34DC8AE40A7EEEF7003E1636 /* stackImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 349DDD5206406A7D00542726 /* stackImage.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   921
		34DC8AE50A7EEEF7003E1636 /* AILocalizationAssistance.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D189B1076131850075A380 /* AILocalizationAssistance.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   922
		34DC8AE70A7EEEF7003E1636 /* AILocalizationButtonCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 078C5CD0079EFF87004C75A4 /* AILocalizationButtonCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   923
		34DC8AE80A7EEEF7003E1636 /* AILocalizationButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 078C5CD1079EFF87004C75A4 /* AILocalizationButtonCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   924
		34DC8AE90A7EEEF7003E1636 /* AILocalizationTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 340833EA075C3A7900703011 /* AILocalizationTextField.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   925
		34DC8AEA0A7EEEF7003E1636 /* AILocalizationTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 340833EB075C3A7900703011 /* AILocalizationTextField.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   926
		34DC8AEB0A7EEEF7003E1636 /* AILocalizationButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D1897D076114C00075A380 /* AILocalizationButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   927
		34DC8AEC0A7EEEF7003E1636 /* AILocalizationButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D1897E076114C00075A380 /* AILocalizationButton.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   928
		34DC8AED0A7EEEF7003E1636 /* AIModularPane.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAA1B370632ED8B00D8B92C /* AIModularPane.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   929
		34DC8AEE0A7EEEF7003E1636 /* AIModularPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAA1B380632ED8B00D8B92C /* AIModularPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   930
		34DC8AEF0A7EEEF7003E1636 /* AIContactInfoPane.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BBF41ED066119A8001D31E1 /* AIContactInfoPane.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   931
		34DC8AF00A7EEEF7003E1636 /* AIContactInfoPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BBF41EE066119A8001D31E1 /* AIContactInfoPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   932
		34DC8AF10A7EEEF7003E1636 /* AIActionDetailsPane.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAA1B350632ED8B00D8B92C /* AIActionDetailsPane.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   933
		34DC8AF20A7EEEF7003E1636 /* AIActionDetailsPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAA1B360632ED8B00D8B92C /* AIActionDetailsPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   934
		34DC8AF30A7EEEF7003E1636 /* AIPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = F5793923033E74C301A8010A /* AIPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   935
		34DC8AF40A7EEEF7003E1636 /* AIPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793913033E748F01A8010A /* AIPreferencePane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   936
		34DC8AF50A7EEEF7003E1636 /* AIModularPaneCategoryView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAD188C066A83550002008E /* AIModularPaneCategoryView.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   937
		34DC8AF60A7EEEF7003E1636 /* AIModularPaneCategoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAD188D066A83550002008E /* AIModularPaneCategoryView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   938
		34DC8AF70A7EEEF7003E1636 /* AIHTMLDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F2E81007C2CD5E007EAAAB /* AIHTMLDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   939
		34DC8AF80A7EEEF7003E1636 /* AIHTMLDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F2E80F07C2CD5E007EAAAB /* AIHTMLDecoder.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   940
		34DC8AF90A7EEEF7003E1636 /* AIIconState.h in Headers */ = {isa = PBXBuildFile; fileRef = 3483928505E68B05002BC6C0 /* AIIconState.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   941
		34DC8AFA0A7EEEF7003E1636 /* AIIconState.m in Sources */ = {isa = PBXBuildFile; fileRef = 3483928405E68B05002BC6C0 /* AIIconState.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   942
		34DC8AFB0A7EEEF7003E1636 /* AIPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5793924033E74C301A8010A /* AIPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   943
		34DC8AFC0A7EEEF7003E1636 /* AIPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793912033E748F01A8010A /* AIPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   944
		34DC8AFD0A7EEEF7003E1636 /* AITextAttachmentExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F2E81807C2CD6B007EAAAB /* AITextAttachmentExtension.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   945
		34DC8AFE0A7EEEF7003E1636 /* AITextAttachmentExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F2E81907C2CD6C007EAAAB /* AITextAttachmentExtension.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   946
		34DC8B010A7EEEF7003E1636 /* ESFileTransfer.h in Headers */ = {isa = PBXBuildFile; fileRef = 348862CD05645E94003C9627 /* ESFileTransfer.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   947
		34DC8B020A7EEEF7003E1636 /* ESFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 348862CE05645E95003C9627 /* ESFileTransfer.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   948
		34DC8B030A7EEEF7003E1636 /* ESFileWrapperExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F2E83907C2CDBD007EAAAB /* ESFileWrapperExtension.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   949
		34DC8B040A7EEEF7003E1636 /* ESFileWrapperExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F2E83807C2CDBD007EAAAB /* ESFileWrapperExtension.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   950
		34DC8B090A7EEEF7003E1636 /* JVFontPreviewField.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8344C07CBE6E2006466F2 /* JVFontPreviewField.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   951
		34DC8B0A0A7EEEF7003E1636 /* JVFontPreviewField.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8344D07CBE6E2006466F2 /* JVFontPreviewField.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   952
		34DFF5FD07A63DB400B92233 /* ESSecureMessagingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34DFF46107A5EABF00B92233 /* ESSecureMessagingPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   953
		34E036720A75AA4F00394F11 /* CBOscarService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B919C9062DEF15004F1223 /* CBOscarService.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   954
		34E036730A75AA4F00394F11 /* CBOscarService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B919CA062DEF15004F1223 /* CBOscarService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   955
		34E036740A75AA4F00394F11 /* CBPurpleOscarAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EA125EE055B633000ECF349 /* CBPurpleOscarAccount.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   956
		34E036750A75AA4F00394F11 /* CBPurpleOscarAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EA125E8055B630900ECF349 /* CBPurpleOscarAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   957
		34E036760A75AA4F00394F11 /* DCPurpleOscarJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D961606B73A96005235E9 /* DCPurpleOscarJoinChatViewController.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   958
		34E036770A75AA4F00394F11 /* DCPurpleOscarJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961706B73A96005235E9 /* DCPurpleOscarJoinChatViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   959
		34E036780A75AA4F00394F11 /* DCPurpleOscarJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40C08086D9100E27095 /* DCPurpleOscarJoinChatView.nib */; };
1000
a6fd3ee7e1c7 Generalize the "use SSL" and "use proxy server" settings into AIPurpleOscarAccountViewController, a superclass of now *Purple[AIM|ICQ]AccountViewController. Huge. Changeset.
Zachary West <zacw@adiumx.com>
parents: 949
diff changeset
   960
		34E036790A75AA4F00394F11 /* AIPurpleAIMAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B9194B062DEC29004F1223 /* AIPurpleAIMAccountViewController.h */; };
a6fd3ee7e1c7 Generalize the "use SSL" and "use proxy server" settings into AIPurpleOscarAccountViewController, a superclass of now *Purple[AIM|ICQ]AccountViewController. Huge. Changeset.
Zachary West <zacw@adiumx.com>
parents: 949
diff changeset
   961
		34E0367A0A75AA4F00394F11 /* AIPurpleAIMAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B9194A062DEC29004F1223 /* AIPurpleAIMAccountViewController.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   962
		34E036880A75AA4F00394F11 /* ESICQService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD5A506E00AD200FF7FBC /* ESICQService.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   963
		34E036890A75AA4F00394F11 /* ESICQService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A606E00AD200FF7FBC /* ESICQService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   964
		34E0368A0A75AA4F00394F11 /* ESPurpleICQAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F52BD806E2B24100887BE2 /* ESPurpleICQAccount.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   965
		34E0368B0A75AA4F00394F11 /* ESPurpleICQAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F52BD906E2B24200887BE2 /* ESPurpleICQAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   966
		34E0368C0A75AA4F00394F11 /* ESPurpleICQAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F52BCF06E2AFF700887BE2 /* ESPurpleICQAccountViewController.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   967
		34E0368D0A75AA4F00394F11 /* ESPurpleICQAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F52BD006E2AFF700887BE2 /* ESPurpleICQAccountViewController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   968
		34E0368E0A75AA4F00394F11 /* ESPurpleICQAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41A08086D9100E27095 /* ESPurpleICQAccountView.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   969
		34E0368F0A75AA4F00394F11 /* PurpleDefaultsICQ.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7644DC07A05E7E0021CCD7 /* PurpleDefaultsICQ.plist */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   970
		34E0EA0807CC53ED00A82198 /* NewMessagePrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34E0EA0707CC53EC00A82198 /* NewMessagePrompt.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   971
		34E0EA0F07CC53FE00A82198 /* AINewMessagePanelPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EA0B07CC53FE00A82198 /* AINewMessagePanelPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   972
		34E0EA1007CC53FE00A82198 /* AINewMessagePromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   973
		34E2A0BC07AF5924006735BC /* ESAccountNetworkConnectivityPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A0BA07AF5924006735BC /* ESAccountNetworkConnectivityPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   974
		34E2A0C307AF593B006735BC /* AIAccountMenuAccessPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A0C107AF593B006735BC /* AIAccountMenuAccessPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   975
		34E2A1DB07AF6504006735BC /* AIDockAccountStatusPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A1D907AF6503006735BC /* AIDockAccountStatusPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   976
		34E2A2F507B018B2006735BC /* ESAddressBookIntegrationAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A2EF07B018B2006735BC /* ESAddressBookIntegrationAdvancedPreferences.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   977
		34E2A3E807B08CCB006735BC /* AIAliasSupportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A3E507B08CC9006735BC /* AIAliasSupportPlugin.m */; };
228
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   978
		34E4CD580E68277D00D1B0DC /* ESIRCService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD4E0E68277D00D1B0DC /* ESIRCService.h */; };
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   979
		34E4CD590E68277D00D1B0DC /* ESIRCJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E4CD4F0E68277D00D1B0DC /* ESIRCJoinChatViewController.m */; };
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   980
		34E4CD5A0E68277D00D1B0DC /* ESIRCJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD500E68277D00D1B0DC /* ESIRCJoinChatViewController.h */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
   981
		34E4CD5B0E68277D00D1B0DC /* ESIRCJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34E4CD510E68277D00D1B0DC /* ESIRCJoinChatView.nib */; };
228
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   982
		34E4CD5C0E68277D00D1B0DC /* ESIRCAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E4CD520E68277D00D1B0DC /* ESIRCAccountViewController.m */; };
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   983
		34E4CD5D0E68277D00D1B0DC /* ESIRCAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD530E68277D00D1B0DC /* ESIRCAccountViewController.h */; };
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   984
		34E4CD5F0E68277D00D1B0DC /* ESIRCAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E4CD550E68277D00D1B0DC /* ESIRCAccount.m */; };
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   985
		34E4CD600E68277D00D1B0DC /* ESIRCAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD560E68277D00D1B0DC /* ESIRCAccount.h */; };
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   986
		34E4CD610E68277D00D1B0DC /* ESIRCService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E4CD570E68277D00D1B0DC /* ESIRCService.m */; };
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   987
		34E4CD660E68279C00D1B0DC /* irc.png in Resources */ = {isa = PBXBuildFile; fileRef = 34E4CD640E68279C00D1B0DC /* irc.png */; };
95825c45a154 Updated paths for [25038]
Evan Schoenberg
parents: 227
diff changeset
   988
		34E4CD670E68279C00D1B0DC /* PurpleDefaultsIRC.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34E4CD650E68279C00D1B0DC /* PurpleDefaultsIRC.plist */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   989
		34E6C5670A791BAF0076D7F0 /* AIContactInfoWindowPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E6C5650A791BAF0076D7F0 /* AIContactInfoWindowPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   990
		34EA6B320A62F3420053DFEB /* AIApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EA6B300A62F3420053DFEB /* AIApplication.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   991
		34EBB2C30DCA8DE500B4CB6E /* AISearchFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EBB2C20DCA8DE500B4CB6E /* AISearchFieldCell.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   992
		34EF904B0E2EB17B003E5DC7 /* AIMobileMeService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34EF90490E2EB17B003E5DC7 /* AIMobileMeService.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   993
		34EF904C0E2EB17B003E5DC7 /* AIMobileMeService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EF904A0E2EB17B003E5DC7 /* AIMobileMeService.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   994
		34EF90570E2EB1A8003E5DC7 /* AIPurpleMobileMeAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34EF90550E2EB1A8003E5DC7 /* AIPurpleMobileMeAccountViewController.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   995
		34EF90580E2EB1A8003E5DC7 /* AIPurpleMobileMeAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EF90560E2EB1A8003E5DC7 /* AIPurpleMobileMeAccountViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   996
		34EF905D0E2EB1C5003E5DC7 /* AIPurpleMobileMeAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34EF905B0E2EB1C5003E5DC7 /* AIPurpleMobileMeAccount.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   997
		34EF905E0E2EB1C5003E5DC7 /* AIPurpleMobileMeAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EF905C0E2EB1C5003E5DC7 /* AIPurpleMobileMeAccount.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   998
		34EF99AA0E2EB35A003E5DC7 /* PurpleDefaultsMobileMe.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34EF99A90E2EB35A003E5DC7 /* PurpleDefaultsMobileMe.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
   999
		34EF9A320E2EB637003E5DC7 /* MobileMe-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 34EF9A300E2EB637003E5DC7 /* MobileMe-large.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1000
		34EF9A330E2EB637003E5DC7 /* MobileMe-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 34EF9A310E2EB637003E5DC7 /* MobileMe-small.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1001
		34F144430BA8FF3C000473DE /* EmoticonNames.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34F144420BA8FF3B000473DE /* EmoticonNames.strings */; };
1647
8c245c9b93a0 Moved the drawing related methods in AIListOutlineView to a category, "AIListOutlineView_Drawing". This makes AIListOutlineView's main implementation a lot easier to deal with.
Evan Schoenberg
parents: 1631
diff changeset
  1002
		34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F17FCC0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h */; settings = {ATTRIBUTES = (Private, ); }; };
8c245c9b93a0 Moved the drawing related methods in AIListOutlineView to a category, "AIListOutlineView_Drawing". This makes AIListOutlineView's main implementation a lot easier to deal with.
Evan Schoenberg
parents: 1631
diff changeset
  1003
		34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F17FCD0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1004
		34F312930ADC3FE800A4310E /* KNShelfSplitView.h in Headers */ = {isa = PBXBuildFile; fileRef = 348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */; settings = {ATTRIBUTES = (Public, ); }; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1005
		34F312BD0ADC43CA00A4310E /* xtras_duck.png in Resources */ = {isa = PBXBuildFile; fileRef = 34F312BC0ADC43CA00A4310E /* xtras_duck.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1006
		34F312F00ADC476300A4310E /* KNShelfSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1007
		34F4677A080F49C5007800AB /* Safari.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 34F46778080F49C5007800AB /* Safari.scpt */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1008
		34F4677B080F49C5007800AB /* Safari.png in Resources */ = {isa = PBXBuildFile; fileRef = 34F46779080F49C5007800AB /* Safari.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1009
		34F46785080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46783080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1010
		34F849530A4AEFA00002A017 /* LogFileUpgrade.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F849520A4AEFA00002A017 /* LogFileUpgrade.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1011
		34F849590A4AF04D0002A017 /* AILogFileUpgradeWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F849570A4AF04D0002A017 /* AILogFileUpgradeWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1012
		34F8D2AE0CF68FEB00F62536 /* AIUserListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F8D2AD0CF68FEB00F62536 /* AIUserListOutlineView.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1013
		34FF12120DA52FB10054A872 /* AIPurpleGTalkJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34FF12100DA52FB10054A872 /* AIPurpleGTalkJoinChatViewController.h */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1014
		34FF12130DA52FB10054A872 /* AIPurpleGTalkJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34FF12110DA52FB10054A872 /* AIPurpleGTalkJoinChatViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1015
		377EC8940AE9525B00CB7BDF /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 377EC8930AE9525B00CB7BDF /* PSMTabBarControl.framework */; };
1793
d61fe09c8a8c I see no particular benefit having the purple plugin as a plugin is giving us. It appears to merely add an extra layer of dynamic linking, and an extra target to maintain. Therefore, this moves it to core components.
David Smith <catfish.man@gmail.com>
parents: 1792
diff changeset
  1016
		377ED0220AE95D7D00CB7BDF /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 377EC8930AE9525B00CB7BDF /* PSMTabBarControl.framework */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1017
		4B08399507D2350D0034A001 /* AIDockIconSelectionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B08399307D2350D0034A001 /* AIDockIconSelectionSheet.m */; };
3884
3113b7777263 Moved AIDockIconSelectionSheet to use AIImageCollectionView (Removed AIImageGridView).
Adrian Godoroja <robotive@me.com>
parents: 3870
diff changeset
  1018
		4B08399C07D235190034A001 /* DockIconSelectionSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B08399B07D235190034A001 /* DockIconSelectionSheet.xib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1019
		4B191D8A0611C10800E8A4E7 /* License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4B191D880611C10800E8A4E7 /* License.txt */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1020
		4B191D8B0611C10800E8A4E7 /* ReadMe.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4B191D890611C10800E8A4E7 /* ReadMe.rtf */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1021
		4B7A567B07A1754400BDC540 /* AIEditAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B7A567807A1754400BDC540 /* AIEditAccountWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1022
		4B909C8A064D75400074C9A8 /* BGEmoticonMenuPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = C4243C930638E4EA007AD2D9 /* BGEmoticonMenuPlugin.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1023
		4B97DB6706AC123A0003EE49 /* msg-insert-link.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4B97DB6606AC123A0003EE49 /* msg-insert-link.tiff */; };
666
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
  1024
		4BA62D8E06C51257001D6B3C /* Status Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BA62D7F06C51256001D6B3C /* Status Icons */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1025
		4BAA1B530632EF0000D8B92C /* events-error-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BAA1B500632EF0000D8B92C /* events-error-alert.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1026
		4BAA1B550632EF0000D8B92C /* ESPanelAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAA1B520632EF0000D8B92C /* ESPanelAlertDetailPane.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1027
		4BAA1B610632EFE700D8B92C /* events-window-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BAA1B600632EFE700D8B92C /* events-window-alert.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1028
		4BAE6C1407CF9374007E2820 /* ESAnnouncerAbstractDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C0C07CF9374007E2820 /* ESAnnouncerAbstractDetailPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1029
		4BAE6C1607CF9374007E2820 /* ESAnnouncerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C0E07CF9374007E2820 /* ESAnnouncerPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1030
		4BAE6C1807CF9374007E2820 /* ESAnnouncerSpeakEventAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1007CF9374007E2820 /* ESAnnouncerSpeakEventAlertDetailPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1031
		4BAE6C1A07CF9374007E2820 /* ESAnnouncerSpeakTextAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1207CF9374007E2820 /* ESAnnouncerSpeakTextAlertDetailPane.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1032
		4BAE6C1F07CF9389007E2820 /* events-announcer-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1B07CF9389007E2820 /* events-announcer-alert.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1033
		4BAE6C2007CF9389007E2820 /* AnnouncerDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1C07CF9389007E2820 /* AnnouncerDefaults.plist */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1034
		4BAE6C2107CF9389007E2820 /* AnnouncerSpeakEventContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1D07CF9389007E2820 /* AnnouncerSpeakEventContactAlert.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1035
		4BAE6C2207CF9389007E2820 /* AnnouncerSpeakTextContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1E07CF9389007E2820 /* AnnouncerSpeakTextContactAlert.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1036
		4BAE6C3607CF93CB007E2820 /* AIContactStatusEventsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C3407CF93CB007E2820 /* AIContactStatusEventsPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1037
		4BAE6C4707CF9411007E2820 /* AIDockBehaviorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4307CF9410007E2820 /* AIDockBehaviorPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1038
		4BAE6C4907CF9411007E2820 /* ESDockAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4507CF9410007E2820 /* ESDockAlertDetailPane.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1039
		4BAE6C4C07CF941C007E2820 /* events-dock-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4A07CF941C007E2820 /* events-dock-alert.tiff */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1040
		4BAE6C4D07CF941C007E2820 /* DockBehaviorContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4B07CF941C007E2820 /* DockBehaviorContactAlert.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1041
		4BAE6C8E07CF94BA007E2820 /* AIStandardToolbarItemsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C8807CF94BA007E2820 /* AIStandardToolbarItemsPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1042
		4BAE6C9007CF94BA007E2820 /* AIStatusChangedMessagesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C8A07CF94BA007E2820 /* AIStatusChangedMessagesPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1043
		4BAE6C9207CF94BA007E2820 /* AITabStatusIconsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C8C07CF94BA007E2820 /* AITabStatusIconsPlugin.m */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1044
		4BAE6C9507CF94C4007E2820 /* events-message.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C9407CF94C4007E2820 /* events-message.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1045
		4BAE6D3D07CFA0BC007E2820 /* AIAppearancePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6D3B07CFA0BC007E2820 /* AIAppearancePreferences.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1046
		4BAE6D4307CFA0CB007E2820 /* AIAppearancePreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6D4107CFA0CB007E2820 /* AIAppearancePreferencesPlugin.m */; };
666
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
  1047
		4BB1E493067F2EAC00D1DB86 /* Scripts in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BB1E47D067F2E9F00D1DB86 /* Scripts */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1048
		4BB2EB220D88D76100CA7A7D /* timestamp32.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB2EB200D88D76100CA7A7D /* timestamp32.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1049
		4BB2EB230D88D76100CA7A7D /* timestamp32_transparent.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1050
		4BB5B78207D2DC4900CFE06F /* pref-status.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB5B78107D2DC4900CFE06F /* pref-status.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1051
		4BB9972B083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99727083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1052
		4BB9972D083D1A5F006ACD6F /* SMContactListShowDetailsPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99729083D1A5F006ACD6F /* SMContactListShowDetailsPane.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1053
		4BB9972F083D1A74006ACD6F /* ContactListShowBehavior.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BB9972E083D1A74006ACD6F /* ContactListShowBehavior.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1054
		4BCAB5F307B59967006641B9 /* EditAccountSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAB5F007B59967006641B9 /* EditAccountSheet.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1055
		4BCAC4CF07B59AFE006641B9 /* AddressBookPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4CE07B59AFE006641B9 /* AddressBookPrefs.nib */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1056
		4BCAC4D907B59B2E006641B9 /* AddressBook.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4D807B59B2E006641B9 /* AddressBook.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1057
		4BCAC4E607B59B65006641B9 /* Alias Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E307B59B65006641B9 /* Alias Defaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1058
		4BCAC4E707B59B65006641B9 /* Display Format Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E407B59B65006641B9 /* Display Format Defaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1059
		4BCAC56D07B5A31A006641B9 /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC56C07B5A31A006641B9 /* Sounds */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1060
		4BD6737406001BF00049CAF7 /* AIAccountListPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = F55B413C03AB895501A8010A /* AIAccountListPreferencesPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1061
		4BD673B706001C5F0049CAF7 /* AIContactStatusColoringPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B31E8C104C46A9100A8010A /* AIContactStatusColoringPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1062
		4BD6741C06001CEF0049CAF7 /* AIMessageAliasPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = F11B9622051CDB3B0000000E /* AIMessageAliasPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1063
		4BD6742E06001D1D0049CAF7 /* AIEmoticonPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F0FE9D04B12CAC01A80106 /* AIEmoticonPreferences.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1064
		4BD6742F06001D1D0049CAF7 /* EmoticonPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5F0FEA004B1336C01A80106 /* EmoticonPrefs.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1065
		4BD6743106001D1E0049CAF7 /* EmoticonDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = F5F0FEA204B133AB01A80106 /* EmoticonDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1066
		4BD6745E06001D740049CAF7 /* ESOpenMessageWindowContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 344AB2C40579136900384CEE /* ESOpenMessageWindowContactAlertPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1067
		4BD6746306001D760049CAF7 /* ESSendMessageContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 342DC5BF05783DE7000E1D83 /* ESSendMessageContactAlertPlugin.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1068
		4BD6746606001D770049CAF7 /* SendMessageContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 342DC7FE05784463000E1D83 /* SendMessageContactAlert.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1069
		4BD6753006001E0D0049CAF7 /* AIDualWindowInterfacePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793980033E756E01A8010A /* AIDualWindowInterfacePlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1070
		4BD6753606001E0F0049CAF7 /* AIMessageTabViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BACB70203C8CB5E00A8010A /* AIMessageTabViewItem.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1071
		4BD6753806001E100049CAF7 /* AIMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A5CE03704D3D01A8010A /* AIMessageViewController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1072
		4BD6753A06001E110049CAF7 /* AIMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793982033E756E01A8010A /* AIMessageWindowController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1073
		4BD6753E06001E140049CAF7 /* AIAccountSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1074
		4BD6755006001E1D0049CAF7 /* ESDualWindowMessageAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B970BF90535B864002F28F9 /* ESDualWindowMessageAdvancedPreferences.m */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1075
		4BD6755406001E1E0049CAF7 /* DualWindowDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1076
		4BD6756B06001E320049CAF7 /* EventSoundDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BA5325D050FC5E800A8010A /* EventSoundDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1077
		4BD6758206001E430049CAF7 /* ErrorMessageHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 40AC0EEC03B5BF1000A80202 /* ErrorMessageHandlerPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1078
		4BD6758406001E440049CAF7 /* ErrorMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 40AC0F1003B5C29E00A80202 /* ErrorMessageWindowController.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1079
		4BD6758506001E450049CAF7 /* ErrorWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 40AC0F1303B5C34800A80202 /* ErrorWindow.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1080
		4BD6758806001E460049CAF7 /* AlertMessageContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3439FD8C05794B4500B2E449 /* AlertMessageContactAlert.nib */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1081
		4BDAF69907A1561000276D68 /* AIAccountProxySettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDAF69607A1561000276D68 /* AIAccountProxySettings.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1082
		4BE6175807AC67EE0049C87D /* AIAutoReplyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6174E07AC67ED0049C87D /* AIAutoReplyPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1083
		4BE6175E07AC67EE0049C87D /* AIStateMenuPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6175407AC67EE0049C87D /* AIStateMenuPlugin.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1084
		4BE9FFE8055981AB00359B15 /* Adium.pch in Resources */ = {isa = PBXBuildFile; fileRef = 4BE9FFE7055981AB00359B15 /* Adium.pch */; };
666
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
  1085
		4BF2EA3F067CB7A200743318 /* Emoticons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E194067CAE9200743318 /* Emoticons */; };
e5f8b4687ee1 Project changes for the Facebook changes"
Evan Schoenberg
parents: 645
diff changeset
  1086
		4BF2EA40067CB7A200743318 /* Message Styles in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E6B3067CB70E00743318 /* Message Styles */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1087
		4BF3CB4207D1771E00A8112A /* pref-appearance.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CB4107D1771E00A8112A /* pref-appearance.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1088
		4BF3CBED07D192F500A8112A /* pref-accounts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CBEC07D192F500A8112A /* pref-accounts.tiff */; };
0
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1089
		4BF98DCD06D149EE00E8781D /* ContactStatusColoringDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B31E8C404C46A9100A8010A /* ContactStatusColoringDefaults.plist */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1090
		4BFC2E7907E357F00063D70C /* emoticonBlank.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BFC2E7807E357F00063D70C /* emoticonBlank.png */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1091
		4BFF665B063693FA00308A3B /* ESSendMessageAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 342DC49C05783BE8000E1D83 /* ESSendMessageAlertDetailPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1092
		4F1CB6260D640D5C0073A1E6 /* AIContactInfoContentController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB6250D640D5B0073A1E6 /* AIContactInfoContentController.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1093
		4F1CB6290D640D680073A1E6 /* AIInfoInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB6280D640D670073A1E6 /* AIInfoInspectorPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1094
		4F1CB62E0D640D770073A1E6 /* AIAdvancedInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB62B0D640D770073A1E6 /* AIAdvancedInspectorPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1095
		4F1CB62F0D640D770073A1E6 /* AIAddressBookInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB62C0D640D770073A1E6 /* AIAddressBookInspectorPane.m */; };
e22ad6bc8b46 svn 1.5 merge tracking is terrible. This is a manual merge of the Sparkle 1.5 branch into trunk
David Smith
parents:
diff changeset
  1096
		4F1CB6320D640D7F0073A1E6 /* AIEventsInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB6310D640D7F0073A1E6 /* AIEventsInspectorPane.m */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1097
		4F1CB6390D640D900073A1E6 /* AIEventsInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6350D640D8F0073A1E6 /* AIEventsInspectorPane.nib */; };
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1098
		4F1CB63A0D640D900073A1E6 /* AIInfoInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6360D640D900073A1E6 /* AIInfoInspectorPane.nib */; };
4707
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1099
		4F1CB63F0D640DA40073A1E6 /* get-info-address-book.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63B0D640DA40073A1E6 /* get-info-address-book.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1100
		4F1CB6400D640DA40073A1E6 /* get-info-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */; };
3b2b8751240e Use the .tiff instead of the png. format.
Robert Vehse
parents: 4701
diff changeset
  1101
		4F1CB6410D640DA40073A1E6 /* get-info-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */; };
4897
5ea3bd51010d I messed up with branching adium-1.5.3. I should've branched it from adium-1.5.2, but used default. This meant many extra changes (new preferences, etc.) got in unintentionally.
Thijs Alkemade <thijsalkemade@gmail.com>
parents: 4794
diff changeset
  1102
		4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.nib */; };
527
4fad07079015 Patch from '''wixardy''' to make the about box scrollable. Fixes #9967.
Zachary West <zacw@adiumx.com>
parents: 519
diff changeset
  1103
		5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
3674
e74c2cb4ccd4 Pretty-ify the new transcript viewer with help from Paul Wilde. Moved AIFilterBarBackgroundBox to AIGradientView (the former stopped being used).
Frank Dowsett <wixardy@adium.im>
parents: