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	Versions now builds completely!	2014-10-24 15:43:35 -04:00
src	Merge remote-tracking branch 'origin/master' into hl7org_structs	2014-12-17 16:08:59 -05:00
.classpath	Begin multi version work	2014-12-01 08:13:32 -05:00
.gitignore	More merging cleanup	2014-11-08 10:38:25 -05:00
.gitignore.orig	Merge branch 'master' of github.com:jamesagnew/hapi-fhir	2014-11-08 10:58:35 -05:00
.project	Doc updates	2014-10-21 13:23:25 -04:00
pom.xml	Merge remote-tracking branch 'origin/master' into hl7org_structs	2014-12-17 16:08:59 -05:00
pom.xml.versionsBackup	Merging	2014-11-08 10:36:27 -05:00