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	Display queries properly in UHN implementation	2014-07-07 15:37:23 -04:00
src/test	Check compartment support in	2014-08-29 13:05:04 -04:00
.classpath	Display queries properly in UHN implementation	2014-07-07 15:37:23 -04:00
.gitignore	Maven plugin now working	2014-03-03 18:22:14 -05:00
.project	Fix a number of unit tests	2014-07-02 15:24:29 -04:00
pom.xml	Tagging and deploying 0.8	2014-12-17 14:22:10 -05:00
pom.xml.versionsBackup	More resource generation	2014-04-02 18:42:16 -04:00