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.Runtime.Remoting | |
| 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.Runtime.Remoting')
| -rw-r--r-- | mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources index 08d770ac1a3..ee06dc6b336 100644 --- a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources +++ b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources @@ -1,4 +1,4 @@ -../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/GlobalSuppressions.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/Properties/AssemblyInfo.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/Reactive/Linq/Observable.Remoting.cs -../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/Reactive/Linq/QueryLanguage.Remoting.cs +../../../external/rx/Rx.NET/System.Reactive.Runtime.Remoting/GlobalSuppressions.cs +../../../external/rx/Rx.NET/System.Reactive.Runtime.Remoting/Properties/AssemblyInfo.cs +../../../external/rx/Rx.NET/System.Reactive.Runtime.Remoting/Reactive/Linq/Observable.Remoting.cs +../../../external/rx/Rx.NET/System.Reactive.Runtime.Remoting/Reactive/Linq/QueryLanguage.Remoting.cs |