MonetDB: iot - Merge changes

2016-06-09 Thread Pedro Ferreira
Changeset: 3cc8124c0247 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cc8124c0247 Modified Files: sql/backends/monet5/iot/basket.c sql/backends/monet5/iot/basket.h sql/backends/monet5/iot/petrinet.c Branch: iot Log Message: Merge changes diffs (94

MonetDB: iot - Merge changes

2016-06-09 Thread Pedro Ferreira
Changeset: d40d60cb293a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d40d60cb293a Modified Files: sql/backends/monet5/iot/50_iot.sql Branch: iot Log Message: Merge changes diffs (13 lines): diff --git a/sql/backends/monet5/iot/50_iot.sql b/sql/backends/monet5/i