Changeset: 3371a58641d0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3371a58641d0 Modified Files: configure.ag monetdb5/mal/mal_interpreter.c Branch: headless Log Message:
Merge with default branch. diffs (71 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -436,3 +436,5 @@ 3dc7b6687e454fc31ce9d3887aa01e457de4e9f2 Mar2011_root e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1 8a1a1b65992cd98423eee70cef0986beb3b7360d Apr2011_root +e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1 +be8ff3e8c6150ec40f4e0d1ba9789bec23621f88 Mar2011_1 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -574,6 +574,13 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Thu Mar 24 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110324 +- Rebuilt. + +* Tue Mar 22 2011 Fabian Groffen <[email protected]> - 11.1.1-20110324 +- gdk: Fixed memory detection on Darwin (Mac OS X) systems not to return + bogus values + * Thu Mar 17 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110317 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.1.1-20110324) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Thu, 24 Mar 2011 09:12:25 +0100 + +monetdb (11.1.1-20110324) unstable; urgency=low + + * gdk: Fixed memory detection on Darwin (Mac OS X) systems not to return + bogus values + + -- Fabian Groffen <[email protected]> Tue, 22 Mar 2011 09:12:24 +0100 + monetdb (11.1.1-20110317) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Mar 22 2011 Fabian Groffen <[email protected]> - 11.1.1-20110324 +- Fixed memory detection on Darwin (Mac OS X) systems not to return + bogus values + * Fri Jan 14 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 - MonetDB/src/gdk was moved to gdk diff --git a/gdk/ChangeLog.Mar2011 b/gdk/ChangeLog.Mar2011 --- a/gdk/ChangeLog.Mar2011 +++ b/gdk/ChangeLog.Mar2011 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Tue Mar 22 2011 Fabian Groffen <[email protected]> -- Fixed memory detection on Darwin (Mac OS X) systems not to return - bogus values - _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
