projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
merge -r 53370:58178
[mono.git]
/
mcs
/
class
/
corlib
/
System.Text
/
DecoderExceptionFallback.cs
diff --git
a/mcs/class/corlib/System.Text/DecoderExceptionFallback.cs
b/mcs/class/corlib/System.Text/DecoderExceptionFallback.cs
index 8d0902138586fed3ee9a00077c11779441584c24..9c42ba7abfd89d62eb2472563d8634bd295fd5f9 100644
(file)
--- a/
mcs/class/corlib/System.Text/DecoderExceptionFallback.cs
+++ b/
mcs/class/corlib/System.Text/DecoderExceptionFallback.cs
@@
-27,7
+27,7
@@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
|| NET_2_0_BOOTSTRAP
+#if NET_2_0
namespace System.Text
{