diff --git a/src/ChangeLog b/src/ChangeLog index d1287673c6b0d34c9a706c1edffbf362370d1018..a67cb33e0289a60c6b2871be18f091e757bddfe4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2016-07-05 Ed Griffiths <edgrif@sanger.ac.uk> + Merge branch 'release/4.43.0' into develop +2016-07-05 zmap <zmap@sanger.ac.uk> + SeqTools version 4.42.1-111-g00f2 - Update RT and git commit reports + src/ChangeLog | 7 +++++++ + 1 file changed, 7 insertions(+) + 2016-07-05 zmap <zmap@sanger.ac.uk> SeqTools version 4.42.1-110-geacf0 - Update RT and git commit reports src/ChangeLog | 10 ++++++++++ @@ -21,6 +28,21 @@ src/build/release_docs/RT_TICKETS_RESOLVED.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) +2016-06-29 Gemma Guest <gb10@sanger.ac.uk> + Logging - TRIVIAL + src/autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +2016-06-29 Gemma Guest <gb10@sanger.ac.uk> + Logging - TRIVIAL + src/autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +2016-06-29 Gemma Guest <gb10@sanger.ac.uk> + Logging - TRIVIAL + src/autogen.sh | 1 + + 1 file changed, 1 insertion(+) + 2016-06-27 zmap <zmap@sanger.ac.uk> SeqTools version 4.42.1-106-ga491 - Update RT and git commit reports src/ChangeLog | 11 +++++++++++ @@ -28,6 +50,8 @@ src/build/release_docs/RT_TICKETS_RESOLVED.txt | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) +2016-06-27 Gemma Guest <gb10@sanger.ac.uk> + Merge branch 'release/4.43.0' into develop 2016-06-27 Gemma Guest <gb10@sanger.ac.uk> Fix bug finding data type - REGRESSION FIX src/seqtoolsUtils/blxGff3Parser.cpp | 4 +++- diff --git a/src/build/release_docs/GIT_COMMITS.txt b/src/build/release_docs/GIT_COMMITS.txt index 02cb2935e839e9f1956ff02e1cf967c32ce42597..00845ca31139a9000f82923844573a4685bd260a 100644 --- a/src/build/release_docs/GIT_COMMITS.txt +++ b/src/build/release_docs/GIT_COMMITS.txt @@ -1,8 +1,6 @@ Git commits for from commit "production" until commit "release/4.43.0" -eacf06c 2016-06-30 Update to fixes etc. for this releaes. - DOC -a491dec 2016-06-27 Fix bug finding data type - REGRESSION FIX c940ac7 2016-06-20 Merge branch 'feature/groups' into develop 3715b99 2016-06-20 Merge branch 'feature/groups' into develop c47482c 2016-06-20 Merge branch 'feature/groups' into develop diff --git a/src/build/release_docs/RT_TICKETS_RESOLVED.txt b/src/build/release_docs/RT_TICKETS_RESOLVED.txt index 513f2b66be9c5d25bba7cb2581b1a2f8428cddf4..d44de33cfb3f7f35e623d82f399f872c8b835360 100644 --- a/src/build/release_docs/RT_TICKETS_RESOLVED.txt +++ b/src/build/release_docs/RT_TICKETS_RESOLVED.txt @@ -1,5 +1,5 @@ -Request Tracker Tickets Resolved from 11/03/2016 to 05/07/2016 +Request Tracker Tickets Resolved from 11/03/2016 to 06/07/2016 ticket/530118 id: ticket/530118