Commit Graph

6 Commits

Author SHA1 Message Date
sergdort cfb8b1558a Merge branch 'master' into swift-3.0
Conflicts:
	RxExample/RxDataSources/DataSources/CollectionViewSectionedDataSource.swift
	RxExample/RxDataSources/DataSources/Differentiator.swift
	RxExample/RxDataSources/DataSources/TableViewSectionedDataSource.swift
	RxExample/RxExample.xcodeproj/project.pbxproj
	RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS-no-module.xcscheme
	RxExample/RxExample/Examples/TableViewPartialUpdates/PartialUpdatesViewController.swift
	RxExample/RxExample/Examples/TableViewWithEditingCommands/TableViewWithEditingCommandsViewController.swift
	RxExample/RxExample/Services/HtmlParsing.swift
	Tests/RxCocoaTests/CLLocationManager+RxTests.swift
	Tests/RxCocoaTests/UICollectionView+RxTests.swift
2016-07-05 18:00:36 +03:00
Krunoslav Zaher 88f718ffc3 Updates latest version of data sources. 2016-07-04 02:06:08 +02:00
Jamie Pinkham 39a20441e1 begin fixing up the examples 2016-06-18 01:24:07 -07:00
Krunoslav Zaher 7687ad4c68 Updates RxDataSources. 2016-04-29 20:52:00 +02:00
Krunoslav Zaher 834cd872f5 Updates data sources. 2016-03-22 11:20:10 +01:00
Krunoslav Zaher 80edd849ff Synchronizes `RxDataSources`. 2016-03-13 17:30:55 +01:00