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	Fix #62 - JPA server failed to correctly process _include when included	2014-12-16 10:38:18 -05:00
src/main	Fix a compile issue reported by Bill de Beaubien	2014-12-10 10:17:33 -05:00
.classpath	Rebuild resource models	2014-07-29 15:59:11 -04:00
.gitignore	Bump 0.3 and get all tests passing	2014-05-11 21:46:36 -04:00
.project	Doc updates	2014-08-09 12:18:47 -04:00
pom.xml	Tagging and deploying 0.8	2014-12-17 14:22:10 -05:00
pom.xml.versionsBackup	Get all of the tests passing again	2014-05-20 18:28:13 -04:00