Jamie Pinkham 0e38ecbc87 Merge branch 'develop' into swift-3.0 ... # Conflicts: # Documentation/DesignRationale.md # Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift # RxCocoa/Common/DelegateProxyType.swift # RxCocoa/iOS/UICollectionView+Rx.swift # RxCocoa/iOS/UIControl+Rx.swift # RxCocoa/iOS/UIScrollView+Rx.swift # RxCocoa/iOS/UITableView+Rx.swift # RxExample/RxDataSources/DataSources+Rx/ObservableConvertibleType+Differentiator.swift # RxSwift/Concurrency/Lock.swift # RxSwift/Disposables/CompositeDisposable.swift # RxSwift/Event.swift # RxSwift/Extensions/String+Rx.swift # RxSwift/Schedulers/OperationQueueScheduler.swift		2016-06-17 21:14:06 -07:00
..
RxCollectionViewDataSourceProxy.swift	Fixes for RxSwift and Swift 3.0.	2016-04-22 20:49:18 +02:00
RxCollectionViewDelegateProxy.swift	Standardizes header format.	2015-12-29 16:56:21 +01:00
RxImagePickerDelegateProxy.swift	Rx wrappers for UIImagePickerController	2016-01-05 15:15:15 +02:00
RxPickerViewDelegateProxy.swift	Added rx_itemSelected for UIPickerView	2016-05-13 10:55:21 +03:00
RxScrollViewDelegateProxy.swift	Fixes for RxSwift and Swift 3.0.	2016-04-22 20:49:18 +02:00
RxSearchBarDelegateProxy.swift	Documents parts of RxCocoa.	2016-04-11 00:31:26 +02:00
RxSearchControllerDelegateProxy.swift	Fix to support iOS 7	2016-05-08 22:42:53 +02:00
RxTableViewDataSourceProxy.swift	Fixes for RxSwift and Swift 3.0.	2016-04-22 20:49:18 +02:00
RxTableViewDelegateProxy.swift	Standardizes header format.	2015-12-29 16:56:21 +01:00
RxTextStorageDelegateProxy.swift	Polish for header validation script.	2016-01-01 20:09:25 +01:00
RxTextViewDelegateProxy.swift	Polish for NSTextView.	2016-01-01 13:13:07 +01:00