Jamie Pinkham 5a9f47262a Merge branch 'upstream-develop' into swift-3.0 ... # Conflicts: # RxCocoa/Common/CocoaUnits/Driver/Driver+Subscription.swift # RxCocoa/Common/CocoaUnits/UIBindingObserver.swift # RxSwift/Schedulers/MainScheduler.swift		2016-06-22 09:54:44 -04:00
..
PerformanceTests	use Foundation.Timer	2016-06-22 09:51:01 -04:00
RxCocoaTests	Merge branch 'upstream-develop' into swift-3.0	2016-06-22 09:54:44 -04:00
RxSwiftTests	clean up syntax to get test building	2016-06-22 09:34:04 -04:00
Tests	clean up syntax to get test building	2016-06-22 09:34:04 -04:00
RxTest.swift	fix what tests i can	2016-06-18 15:43:27 -07:00