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	Merge branch 'master' of github.com:jamesagnew/hapi-fhir	2014-07-21 09:24:38 -04:00
src	Merge remote-tracking branch 'origin/master' into hl7org_structs	2014-12-17 16:08:59 -05:00
.classpath	Fix a number of unit tests	2014-07-02 15:24:29 -04:00
.gitignore	More work on JPA	2014-05-29 19:00:16 -04: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	Bump 0.3 and get all tests passing	2014-05-11 21:46:36 -04:00