Scripts
preparemerge

History Graph

Commit	Author	Details	Committed
9f660c272a4f	Christoph Schaefer	handled merge problems, with potfile and potential contention, not enough…	Nov 21 2018
f5184db53091	fourestey	updated version	Nov 16 2018
498c806cb98d	fourestey	script moved to their specific folders	Nov 16 2018
ac8fb0677960	Christoph Schaefer	Potential benchmark added	Oct 26 2018
32cb389eae45	Christoph Schaefer	preparing merge	Jul 18 2018
ad2167a0115f	Christoph Schaefer	commit	Jul 2 2018
bb0407cd9df4	Christoph Schaefer	Resolved last bug, Created Tests for paper	Jun 4 2018
045e534d9c98	Christoph Schaefer	cleaned up files a bit	Feb 13 2018
fe40acb75d90	Christoph Schaefer	updating benchmarks for master	Feb 13 2018
7efac3b8c77f	Christoph Schaefer	cleaned up master a bit and created test scripts	Feb 13 2018