Changeset: 9d02dfed3b98 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d02dfed3b98 Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: default Log Message:
Merge with Dec2016 branch. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -643,3 +643,4 @@ 293b452cd1e5964d820f7d6c538e06507e575d88 0027cb04877b7687f45277a81a25253a63e9f21f Dec2016_root ea0fe76e0095771bccca626b39e3e839a90ba320 Dec2016_1 ea0fe76e0095771bccca626b39e3e839a90ba320 Dec2016_release +deeebb69952f76e3377664bb97997885b283f9d1 fix-bad-merge _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
