Merge branch 'ct-groups-and-cases' of https://github.com/RubberCthulhu/rebar
into RubberCthulhu-ct-groups-and-cases
Conflicts:
THANKS
Project: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/commit/388ed045
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/tree/388ed045
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/diff/388ed045
Branch: refs/heads/import
Commit: 388ed045d44359142d8ba9e964e5fc3c4bbcc5ab
Parents: 881df99 b041bd9
Author: Fred Hebert <monon...@ferd.ca>
Authored: Wed May 27 08:27:09 2015 -0400
Committer: Fred Hebert <monon...@ferd.ca>
Committed: Wed May 27 08:27:09 2015 -0400
----------------------------------------------------------------------
THANKS | 1 +
src/rebar.erl | 2 +-
src/rebar_ct.erl | 72 +++++++++++++++++++++++++++++++++++++++++----------
3 files changed, 61 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/388ed045/THANKS
----------------------------------------------------------------------
diff --cc THANKS
index d9b9984,13e1cd7..a205df7
--- a/THANKS
+++ b/THANKS
@@@ -135,7 -135,4 +135,8 @@@ Pavel Baturk
Igor Savchuk
Mark Anderson
Brian H. Ward
+David Kubecka
+Carlos Eduardo de Paula
+Paulo F. Oliveira
+Derek Brown
+ Danil Onishchenko
