Changeset: 220b16dc6115 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=220b16dc6115
Modified Files:
MonetDB5/src/mal/mal_instruction.mx
Branch: default
Log Message:
Merge error.
diffs (11 lines):
diff -r 6e21e3623480 -r 220b16dc6115 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx Fri May 21 15:57:39 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx Fri May 21 16:33:15 2010 +0200
@@ -2743,7 +2743,6 @@
break;
}
return fcnDefinition(mb, p, s, flg, base, len);
- case NOOPsymbol:
case REMsymbol:
case NOOPsymbol:
if(getVar(mb, getArg(p, 0))->value.val.sval)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
