Jamie Pinkham
|
39a20441e1
|
begin fixing up the examples
|
2016-06-18 01:24:07 -07:00 |
|
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 |
Krunoslav Zaher
|
49b1481dff
|
Updates RxDataSources.
|
2016-05-15 20:44:41 +02:00 |
|
Krunoslav Zaher
|
779eb92d9e
|
Fixes copyright in header.
|
2016-04-30 12:06:00 +02:00 |
|
Krunoslav Zaher
|
7687ad4c68
|
Updates RxDataSources.
|
2016-04-29 20:52:00 +02:00 |
|
Krunoslav Zaher
|
c4ca775bdc
|
Changes for Swift 3.0.
|
2016-04-22 13:14:41 +02:00 |
|
Krunoslav Zaher
|
c234adb9d7
|
Fixes compilation problems with 9.3 runtime.
|
2016-03-22 11:44:46 +01:00 |
|
Krunoslav Zaher
|
834cd872f5
|
Updates data sources.
|
2016-03-22 11:20:10 +01:00 |
Jorge Bernal
|
eddbd23aa5
|
Use new associatedtype syntax
|
2016-03-22 11:09:16 +01:00 |
|
Krunoslav Zaher
|
f9663df3bf
|
Fixes compilation of example app.
|
2016-03-13 18:01:39 +01:00 |
|
Krunoslav Zaher
|
6b3b732208
|
Fixes RxExample-no-module compilation.
|
2016-03-13 17:50:52 +01:00 |
|
Krunoslav Zaher
|
ccd4f29231
|
Fixes debug configuration.
|
2016-03-13 17:30:55 +01:00 |
|
Krunoslav Zaher
|
80edd849ff
|
Synchronizes `RxDataSources`.
|
2016-03-13 17:30:55 +01:00 |