MonetDB: headless - Fix merge.

2011-03-22 Thread Sjoerd Mullender
Changeset: 84348890343d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84348890343d Modified Files: gdk/gdk_col.c Branch: headless Log Message: Fix merge. diffs (12 lines): diff --git a/gdk/gdk_col.c b/gdk/gdk_col.c --- a/gdk/gdk_col.c +++ b/gdk/gdk_col.c @@

MonetDB: headless - Fix merge.

2011-03-22 Thread Sjoerd Mullender
Changeset: f2e1bb840d8d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2e1bb840d8d Modified Files: gdk/gdk_col.c Branch: headless Log Message: Fix merge. diffs (12 lines): diff --git a/gdk/gdk_col.c b/gdk/gdk_col.c --- a/gdk/gdk_col.c +++ b/gdk/gdk_col.c @@