Merge remote branch 'origin/master'

2011-12-27 21:29:48 +04:00
parent 6aafaa1851 4579c9826f
commit 939f9ac279
51 changed files with 283 additions and 162 deletions
@@ -403,7 +403,7 @@ public class ReadClassDataTest extends UsefulTestCase {
                List<String> list = new ArrayList<String>();
                for (JetType upper : param.getUpperBounds()) {
                    StringBuilder sb = new StringBuilder();
-                    new Serializer(sb).serialize(upper);
+                    new ValueParameterSerializer(sb).serialize(upper);
                    list.add(sb.toString());
                }
                Collections.sort(list);