RxSwift/RxExample/RxExample/Examples
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
..
APIWrappers Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
Calculator Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
GeolocationExample Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
GitHubSearchRepositories Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
GitHubSignup Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
ImagePicker Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
Numbers Moves RxCocoa extensions from `rx_` syntax to `rx.` syntax. 2016-08-09 00:17:38 +02:00
OSX simple example Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
SimpleTableViewExample Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
SimpleTableViewExampleSectioned Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
SimpleValidation Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
TableViewPartialUpdates Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
TableViewWithEditingCommands Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
WikipediaImageSearch Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 12:17:26 +02:00
Dependencies.swift Fixes example app. 2016-07-07 23:50:38 +02:00