From: Frederik Carlier <frederik.carlier@quamotion.mobi>
Date: Tue, 8 Mar 2016 18:41:40 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=62c49f89ad1cc35593a00d909ea57bb41955288b

Merge branch 'master'
---

62c49f89ad1cc35593a00d909ea57bb41955288b
diff --cc mcs/class/corlib/corlib.dll.sources
index 986028f677f,3cd521b6442..4d4fc1260a3
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@@ -164,16 -162,10 +162,12 @@@ System.Diagnostics/StackFrame.c
  System.Diagnostics/StackTrace.cs
  System.Diagnostics.Tracing/EventAttribute.cs
  System.Diagnostics.Tracing/EventCommand.cs
- ../../../external/referencesource/mscorlib/system/diagnostics/eventing/winmeta.cs
- ../../../external/referencesource/mscorlib/system/diagnostics/eventing/eventactivityoptions.cs
- ../../../external/referencesource/mscorlib/system/diagnostics/eventing/TraceLogging/EventSourceOptions.cs
- ../../../external/referencesource/mscorlib/system/diagnostics/eventing/TraceLogging/TraceLoggingEventTraits.cs
- System.Diagnostics.Tracing/EventSourceSettings.cs
  System.Diagnostics.Tracing/EventSource.cs
  System.Diagnostics.Tracing/EventSourceAttribute.cs
+ System.Diagnostics.Tracing/EventSourceSettings.cs
  System.Diagnostics.Tracing/EventCommandEventArgs.cs
 +System.Diagnostics.Tracing/EventListener.cs
 +System.Diagnostics.Tracing/EventWrittenEventArgs.cs
  System.Diagnostics.Tracing/NonEventAttribute.cs
  System.Diagnostics.SymbolStore/ISymbolBinder.cs
  System.Diagnostics.SymbolStore/ISymbolBinder1.cs