changeset 6:bdfae2ec4160

Merge heads, taking the older (original) version.
author Sjoerd Mullender <sjoerd@acm.org>
date Thu, 10 Aug 2017 16:23:35 +0200 (2017-08-10)
parents 4e6313f602da (current diff) 0ac4db5158ca (diff)
children fbf63218588c
files Makefile MonetDB-release-epel-1.3/MonetDB-GPG-KEY MonetDB-release-epel-1.3/monetdb.repo MonetDB-release-epel.spec
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff