summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-02 20:25:04 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-02 20:25:04 +0000
commita85a0ddf0a2d72cb9aa7bea6be4a5d0034b3bfd8 (patch)
treee565e1388e96c1de05bc925858791139fa9bdb2a
parent525c60b4cd6381f033e4a25e1df40c843ca0edd8 (diff)
merge revision(s) 40069:
win32.c: missing break * win32/win32.c (constat_attr): fix missing break. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--version.h2
-rw-r--r--win32/win32.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/version.h b/version.h
index ab63aa000e..6367f8b516 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-03"
-#define RUBY_PATCHLEVEL 101
+#define RUBY_PATCHLEVEL 102
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4
diff --git a/win32/win32.c b/win32/win32.c
index c4678b1593..d88de7fe3a 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -5629,6 +5629,7 @@ constat_attr(int count, const int *seq, DWORD attr, DWORD default_attr)
case 40:
attr &= ~(BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED);
+ break;
case 41:
attr = attr & ~(BACKGROUND_BLUE | BACKGROUND_GREEN) | BACKGROUND_RED;
break;