Merge remote-tracking branch 'origin/devel' into appveyor

2015-10-13 16:14:19 -07:00 · 2015-10-13 16:14:19 -07:00 · 6e8cb658c3
commit 6e8cb658c3
parent f3a2efa6ae a40ace648d
3 changed files with 9 additions and 9 deletions
--- a/tests/objects/tobjconstr2.nim
+++ b/tests/objects/tobjconstr2.nim
@ -24,7 +24,7 @@ var b = Bar(x: 100, y: 200) # used to fail
 # bug 1275

 type
-  Graphic = object of TObject
+  Graphic = object of RootObj
    case kind: range[0..1]
    of 0:
      radius: float