Skip to content
Snippets Groups Projects
  1. May 24, 2017
  2. May 20, 2017
  3. May 19, 2017
  4. May 18, 2017
  5. May 17, 2017
  6. May 16, 2017
  7. May 15, 2017
    • mak28ma's avatar
    • Markus Krug's avatar
      88018570
    • Markus Krug's avatar
      feed6c1e
    • Markus Krug's avatar
      forgot to remove a project from the pom · 0b0473d3
      Markus Krug authored
      0b0473d3
    • Markus Krug's avatar
      Merge branch 'newEditorBranch' of · d70b3d28
      Markus Krug authored
      https://gitlab2.informatik.uni-wuerzburg.de/kallimachos/Athen into
      newEditorBranch
      
      # Conflicts:
      #	de.uniwue.mk.athen/bundles/de.uniwue.ag.athen.medIE.algorithm/src/de/uniwue/ag/athen/medIE/algorithm/IMedicalInformationExtractionAlgorithmOld.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.ag.athen.medIE.algorithm/src/de/uniwue/ag/athen/medIE/algorithm/impl/OWLMatch.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.ag.athen.medIE.algorithm/src/de/uniwue/ag/athen/medIE/algorithm/impl/RuleBasedMedicalInformationExtraction.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.ag.athen.medIE.algorithm/src/de/uniwue/ag/athen/medIE/algorithm/impl/TextRange.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.ag.athen.medIE.algorithm/src/de/uniwue/ag/athen/medIE/algorithm/impl/ValueMatch.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.mk.athen.medie.owl.view/src/de/uniwue/mk/athen/medie/owl/evaluation/EvaluationUtil.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.mk.kall.athen.appDelegation/src/de/uniwue/mk/kall/athen/appDelegation/ui/MasterPart.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.mk.medIE.extraction.algorithm/src/de/uniwue/mk/medIE/extraction/algorithm/SimpleInSegmentMatchingAlgorithm.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.mk.medIE.terminologyView/src/de/uniwue/mk/medIE/terminologyView/ConceptIdFilter.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.mk.medIE.terminologyView/src/de/uniwue/mk/medIE/terminologyView/TerminologyTreeViewDialog.java
      #	de.uniwue.mk.athen/bundles/de.uniwue.mk.medIE.terminologyView/src/de/uniwue/mk/medIE/terminologyView/widgets/TerminologyTreeView.java
      d70b3d28
    • Markus Krug's avatar
      merged · 665ba41d
      Markus Krug authored
      665ba41d
    • Markus Krug's avatar
      merged from weekend changes · 740d685a
      Markus Krug authored
      740d685a
  8. May 14, 2017
  9. May 13, 2017
Loading