Resolved merge conflict in EdtiCommandTest.java
[jalview.git] / test / jalview / ws / jabaws / JalviewJabawsTestUtils.java
2015-07-23 tcofoegbuJAL-1805 modified test setup's so the are ran for group...
2015-07-07 tcofoegbuJAL-1805 test envirionment separation
2015-06-19 tcofoegbuJAL-1270 test suits import order refactor features/JAL-1270_JUnit-to-TestNG features/JAL-1782_JUnit-to-TestNG
2015-06-19 tcofoegbuJAL-1270 JUnit to TestNG refactoring
2015-03-30 gmungocJAL-1270 fall back on compbio if no localhost:8080...
2015-03-26 gmungocMerge develop to Release_2_8_3_Branch
2015-03-06 Jim ProcterJAL-1683 replace year/version strings with tokens in...
2014-12-22 Jim ProcterMerge: 497958b 68dcaa7
2014-12-15 Jim ProcterJAL-1620 version bump and release notes
2014-11-19 gmungocJAL-1342 new command-line parameter -jabaws <URL>
2014-06-10 Jim ProcterJAL-1379 allow JABA2 tests to run on local or default...
2014-06-06 Jim ProcterJAL-1517 source formatting
2014-06-06 Jim ProcterJAL-1517 fix copyright for 2.8.2
2014-01-29 Jim ProcterJAL-1432 updated copyright notices
2013-05-24 Jim ProcterJAL-1295 refactored Jws2 discovery bootstrap code to...