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 #249 from pcc/xgetinputfocus
[mono.git]
/
mcs
/
class
/
WindowsBase
/
System.Windows.Markup
/
ContentWrapperAttribute.cs
diff --git
a/mcs/class/WindowsBase/System.Windows.Markup/ContentWrapperAttribute.cs
b/mcs/class/WindowsBase/System.Windows.Markup/ContentWrapperAttribute.cs
index 8dbb4f6bf71d44b680a8efc2cf198df7e344b2b5..888e90105fddb499f4608af087eac9a68ab9949f 100644
(file)
--- a/
mcs/class/WindowsBase/System.Windows.Markup/ContentWrapperAttribute.cs
+++ b/
mcs/class/WindowsBase/System.Windows.Markup/ContentWrapperAttribute.cs
@@
-1,3
+1,4
@@
+#if !NET_4_0
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@
-62,3
+63,4
@@
namespace System.Windows.Markup {
}
}
+#endif