MonetDB: default - Merge with Jan2014 branch, not changing any f...

Changeset: 3d1905d3eba2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d1905d3eba2 Modified Files: NT/rules.msc testing/Mtest.py.in Branch: default Log Message: Merge with Jan2014 branch, not changing any files. _

MonetDB: Jan2014 - Removed duplicate changelog messages.

Changeset: 0f574f170765 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f574f170765 Modified Files: MonetDB.spec debian/changelog Branch: Jan2014 Log Message: Removed duplicate changelog messages. diffs (115 lines): diff --git a/MonetDB.spec b/MonetDB.spec

MonetDB: default - Merge with Jan2014 branch.

Changeset: 898bc5808d72 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=898bc5808d72 Modified Files: MonetDB.spec debian/changelog sql/backends/monet5/sql_gencode.c sql/server/sql_atom.c sql/server/sql_atom.h Branch: default Log Message:

MonetDB: Jan2014 - Removed last vestiges of jsonstore.

Changeset: 65aa5016912e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65aa5016912e Modified Files: NT/rules.msc testing/Mtest.py.in Branch: Jan2014 Log Message: Removed last vestiges of jsonstore. Will not be propagated. diffs (26 lines): diff --git a/NT/