summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-05-22 13:03:14 (GMT)
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-05-22 13:03:14 (GMT)
commit79ae4aedde34422a42ec18eacb163542665ea943 (patch)
tree6a10b03b1d7f91b1b598a05377f8bd6924f9a08d
parent4669a9a2df4f9be227074bf7f272649b6b94214b (diff)
parent43d3faa64776d441e01f67e0f9b9655ad6c3f89d (diff)
downloaddefinitions-79ae4aedde34422a42ec18eacb163542665ea943.tar.gz
Merge branch 'master' of git://git.baserock.org/baserock/baserock/definitions
Conflicts: trove.morph
-rwxr-xr-xtrove.configure11
1 files changed, 11 insertions, 0 deletions
diff --git a/trove.configure b/trove.configure