jamesagnew 3963bb68e8 Merge remote-tracking branch 'origin/master' into hl7org_structs ... Conflicts: hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java		2014-12-17 16:08:59 -05:00
..
.settings	Merging	2014-11-08 10:36:27 -05:00
src	More work on DEV operations	2014-12-15 17:41:24 -05:00
.classpath	More work on DEV operations	2014-12-15 17:41:24 -05:00
.gitignore	Lots of tester enhancements	2014-07-02 08:57:07 -04:00
.project	Fix compile issues in previous merge	2014-11-08 11:18:04 -05:00
pom.xml	Tagging and deploying 0.8	2014-12-17 14:22:10 -05:00
pom.xml.versionsBackup	Release 0.4	2014-07-13 21:59:41 -04:00