hapi-fhir/hapi-fhir-structures-dstu
James Agnew 826fa1d7c1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_PatientResourceProvider.java
	hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_SimpleRestfulServer.java
	src/changes/changes.xml
2014-12-03 13:49:19 -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 branch 'master' of github.com:jamesagnew/hapi-fhir 2014-12-03 13:49:19 -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 set version for all hapi projects to 0.8-uhn-branch 2014-11-20 14:48:33 -05:00
pom.xml.versionsBackup Add validate method 2014-04-25 08:23:58 -04:00