diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-08-13 07:44:08 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-08-13 07:44:08 -0700 |
| commit | 2e37fd0a43577b45d65b582e0765c93f3b8bad51 (patch) | |
| tree | a5933ad288bd320d30bc85e82a022f2a4591a2ae | |
| parent | 02ec545c9b188bcbf21c0910ee538e572b9fcbf8 (diff) | |
| parent | 21712a326afeef020f3de9103132cab6929c6f31 (diff) | |
| download | coreclr-2e37fd0a43577b45d65b582e0765c93f3b8bad51.tar.gz coreclr-2e37fd0a43577b45d65b582e0765c93f3b8bad51.tar.bz2 coreclr-2e37fd0a43577b45d65b582e0765c93f3b8bad51.zip | |
Merge pull request #1383 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/mscorlib/model.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index 8c11c30b31..4d169f8ae8 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -9745,6 +9745,10 @@ </Type> <Type Status="ImplRoot" Name="System.Diagnostics.StackFrameHelper" /> + <Type Status="ImplRoot" Name="System.Diagnostics.Tracing.EnumHelper<UnderlyingType>"> + <Member Name="Identity(UnderlyingType)" /> + </Type> + <Type Name="System.Diagnostics.Tracing.EventAttribute"> <Member Name="#ctor(System.Int32)" /> <Member Name="get_EventId" /> |