Files
ReactiveCocoa/.gitmodules
Justin Spahr-Summers c3259cb83f Merge remote-tracking branch 'origin/2.0-development' into signal-for-selector-from-protocol
Conflicts:
	.gitmodules
	ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/project.pbxproj
	ReactiveCocoaFramework/ReactiveCocoa/RACEventTrampoline.h
	ReactiveCocoaFramework/ReactiveCocoa/RACObservablePropertySubject.m
	ReactiveCocoaFramework/ReactiveCocoa/ReactiveCocoa.h
2013-06-24 21:04:23 -07:00

10 lines
309 B
Plaintext

[submodule "external/specta"]
path = external/specta
url = git://github.com/github/specta.git
[submodule "external/expecta"]
path = external/expecta
url = git://github.com/github/expecta.git
[submodule "external/xcconfigs"]
path = external/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git