user/linus/catlfish.git - Linus' CT repository

	Commit message (Expand)	Author	Age	Files	Lines
*	Wait for merge in tests	Magnus Ahltorp	2017-02-06	5	-12/+21
*	Added tools for getting and generating global config	Magnus Ahltorp	2017-02-02	7	-26/+63
*	merge_sth.py doesn't do the right thing when 'sth' is missing.erlmerge_backup	Linus Nordberg	2017-02-02	1	-0/+1
*	Parallelised merge, distribution phase.erlmerge_dist	Linus Nordberg	2017-02-01	6	-5/+43
*	Verify config file signature	Magnus Ahltorp	2017-02-01	1	-1/+1
*	API keys are now provided in the config file.	Magnus Ahltorp	2017-01-20	1	-11/+18
*	Change hard coded paths to use variables	Magnus Ahltorp	2016-11-22	1	-8/+8
*	Added performance tests	Magnus Ahltorp	2016-11-02	2	-1/+72
*	Test failing merge backup	Magnus Ahltorp	2016-10-14	10	-46/+92
*	Make tests run independently from cwd	Magnus Ahltorp	2016-10-13	10	-132/+139
*	Specify where to source test.shvars from ('./').	Linus Nordberg	2016-10-06	10	-10/+10
*	Move test preparation to separate shell script	Magnus Ahltorp	2016-10-05	2	-47/+89
*	Move tests to shell scripts	Magnus Ahltorp	2016-10-05	9	-0/+249