diff options
| author | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-01-24 11:41:44 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-01-24 11:41:44 +0400 |
| commit | f6093bbb3bfaabe128d3b49c9532b490f5a219f7 (patch) | |
| tree | 68eff93c3a36255bc58f95634b8508120f931dc8 /mcs/class/System.Reactive.Windows.Threading | |
| parent | 05b1cf3399f2b45afafaa22afdb847dd8715493e (diff) | |
Revert "update rx to the latest rx-oss-v1.1 build."
This reverts commit 924ab25739968ab2408a7c39f105405c2a89c613.
Conflicts:
external/rx
mcs/class/build-rx-dll-sources.sh
mcs/class/project_template_android.txt
mcs/class/project_template_ios.txt
Diffstat (limited to 'mcs/class/System.Reactive.Windows.Threading')
| -rw-r--r-- | mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources index b526b72ba3c..7b287a88233 100644 --- a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources +++ b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources @@ -1,8 +1,8 @@ -../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/GlobalSuppressions.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Concurrency/CoreDispatcherScheduler.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Internal/Constants.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Linq/CoreDispatcherObservable.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Linq/DispatcherObservable.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Concurrency/DispatcherScheduler.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Properties/AssemblyInfo.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Strings_WindowsThreading.Generated.cs +../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/GlobalSuppressions.cs +../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Reactive/Concurrency/CoreDispatcherScheduler.cs +../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Reactive/Internal/Constants.cs +../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Reactive/Linq/CoreDispatcherObservable.cs +../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Reactive/Linq/DispatcherObservable.cs +../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Reactive/Concurrency/DispatcherScheduler.cs +../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Properties/AssemblyInfo.cs +../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Strings_WindowsThreading.Generated.cs |