projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge pull request #347 from JamesB7/master
[mono.git]
/
mcs
/
class
/
System.Xaml
/
System.Windows.Markup
/
ContentWrapperAttribute.cs
diff --git
a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
index c18653fcfbb273fbdb82ecd5db16e81fb4f47d2e..12e10c5e151921c836a62e533c76bd5dce1fb032 100755
(executable)
--- a/
mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
+++ b/
mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
@@
-38,7
+38,7
@@
namespace System.Windows.Markup
public Type ContentWrapper { get; private set; }
#if !NET_2_1
public override Object TypeId {
- get { return
ContentWrapper
; }
+ get { return
this
; }
}
#endif