RxSwift/RxExample/RxExample
Jérôme Alves e4e422c4f1 Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix
Conflicts:
	RxCocoa/Common/Observables/NSNotificationCenter+Rx.swift
	RxCocoa/OSX/NSImageView+Rx.swift
	RxCocoa/iOS/UICollectionView+Rx.swift
	RxCocoa/iOS/UIControl+Rx.swift
	RxCocoa/iOS/UIImageView+Rx.swift
	RxCocoa/iOS/UILabel+Rx.swift
	RxCocoa/iOS/UITableView+Rx.swift
	RxExample/RxDataSources/DataSources+Rx/UISectionedViewType+RxAnimatedDataSource.swift
	RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift
	RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift
	RxExample/RxExample/Examples/GitHubSignup/UsingDriver/GitHubSignupViewController2.swift
	RxExample/RxExample/Examples/GitHubSignup/UsingVanillaObservables/GitHubSignupViewController1.swift
	RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift
	RxExample/RxExample/Examples/OSX simple example/IntroductionExampleViewController.swift
	RxExample/RxExample/Examples/SimpleTableViewExample/SimpleTableViewExampleViewController.swift
	RxExample/RxExample/Examples/SimpleTableViewExampleSectioned/SimpleTableViewExampleSectionedViewController.swift
	RxExample/RxExample/Examples/SimpleValidation/SimpleValidationViewController.swift
	RxExample/RxExample/Examples/TableViewPartialUpdates/PartialUpdatesViewController.swift
	RxExample/RxExample/Examples/TableViewWithEditingCommands/TableViewWithEditingCommandsViewController.swift
	RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchCell.swift
	RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift
	Tests/RxCocoaTests/DelegateProxyTest.swift
	Tests/RxCocoaTests/KVOObservableTests.swift
	Tests/RxCocoaTests/RxTest+Controls.swift
	Tests/RxCocoaTests/UICollectionView+RxTests.swift
	Tests/RxCocoaTests/UIScrollView+RxTests.swift
	Tests/RxCocoaTests/UITableView+RxTests.swift
2016-08-15 12:17:26 +02:00
..
Examples Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
Images.xcassets Fixes warnings. 2016-04-22 13:03:16 +02:00
OSX Fixes warnings. 2016-08-07 18:59:36 +02:00
RxExample.xcdatamodeld Unit test pass and all of the bugs are fixed. 2015-04-08 00:28:38 +02:00
Services Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
iOS Modernizes APIs. 2016-08-07 20:14:19 +02:00
Example.swift begin fixing up the examples 2016-06-18 01:24:07 -07:00
Info-OSX.plist Fixes xcode warnings. 2015-10-02 21:21:44 +02:00
Info-iOS.plist Fixes xcode warnings. 2015-10-02 21:21:44 +02:00
Operators.swift Replaces all calls to `StableCompositeDisposable.create()` with `Disposables.create()`. 2016-08-10 14:49:21 +01:00
String+URL.swift begin fixing up the examples 2016-06-18 01:24:07 -07:00
ViewController.swift Modernizes APIs. 2016-08-07 20:14:19 +02:00