# HG changeset patch
# User Anders Johnsen <skabet@gmail.com>
# Date 1216671246 -7200
# Node ID bb01c1dc452acffca62cdbbe2441f37333ea16ab
# Parent  2149f4a7b48db9f7a4398bf172b7ce1bd0ff12f0# Parent  2c5a8061aa4a2c6f280abf7f4e7e2794a724ba03
Merge commit

diff -r 2149f4a7b48d -r bb01c1dc452a tests/code/switch_1.d
--- a/tests/code/switch_1.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/code/switch_1.d	Mon Jul 21 22:14:06 2008 +0200
@@ -1,6 +1,7 @@
 
-void main(int x)
+void main()
 {
+    int x;
     switch (x)
     {
     }
diff -r 2149f4a7b48d -r bb01c1dc452a tests/code/switch_2.d
--- a/tests/code/switch_2.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/code/switch_2.d	Mon Jul 21 22:14:06 2008 +0200
@@ -1,6 +1,7 @@
 
-void main(int x)
+void main()
 {
+    int x;
     switch (x)
     {
         case 1:
diff -r 2149f4a7b48d -r bb01c1dc452a tests/code/switch_3.d
--- a/tests/code/switch_3.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/code/switch_3.d	Mon Jul 21 22:14:06 2008 +0200
@@ -1,6 +1,7 @@
 
-void main(int x)
+void main()
 {
+    int x;
     switch (x)
     {
         case 1, 2:
diff -r 2149f4a7b48d -r bb01c1dc452a tests/code/switch_4.d
--- a/tests/code/switch_4.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/code/switch_4.d	Mon Jul 21 22:14:06 2008 +0200
@@ -1,6 +1,7 @@
 
-int main(int x)
+int main()
 {
+    int x;
     switch (x)
     {
         case 1, 2:
diff -r 2149f4a7b48d -r bb01c1dc452a tests/parser/class_2.d
--- a/tests/parser/class_2.d	Mon Jul 21 22:12:33 2008 +0200
+++ b/tests/parser/class_2.d	Mon Jul 21 22:14:06 2008 +0200
@@ -4,12 +4,12 @@
     int a;
 }
 
-class B
+class B : A
 {
     int b;
 }
 
-class C : A, B
+class C : B
 {
     int c;
 }