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 issue #52 - JPA module won't save resource types with empty path

2014-11-17 16:58:34 -05:00

src

Merge remote-tracking branch 'origin/master' into hl7org_structs

2014-12-17 16:08:59 -05:00

.gitignore

More merging cleanup

2014-11-08 10:38:25 -05:00

.project

Merging

2014-11-08 10:36:27 -05:00

pom.xml

Merge remote-tracking branch 'origin/master' into hl7org_structs

2014-12-17 16:08:59 -05:00

pom.xml.versionsBackup

Add validate method

2014-04-25 08:23:58 -04:00