hapi-fhir/hapi-fhir-base
James Agnew 094a617644 Merge branch 'versions'
Conflicts:
	hapi-fhir-base/examples/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
	hapi-fhir-base/testmindeps/pom.xml
	hapi-fhir-jpaserver-uhnfhirtest/pom.xml
	hapi-fhir-testpage-overlay/pom.xml
	hapi-tinder-plugin/pom.xml
	hapi-tinder-test/pom.xml
	restful-server-example-test/pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/pom.xml
2014-10-29 15:34:59 -04:00
..
.settings Versions now builds completely! 2014-10-24 15:43:35 -04:00
examples Merge branch 'versions' 2014-10-29 15:34:59 -04:00
src Merge branch 'versions' 2014-10-29 15:34:59 -04:00
testmindeps Merge branch 'versions' 2014-10-29 15:34:59 -04:00
.classpath Add suport for composite and sorting to JPA (not yet complete) 2014-07-29 09:10:25 -04:00
.gitignore Still more versions work 2014-10-16 13:41:57 -04:00
.project Fix a number of unit tests 2014-07-02 15:24:29 -04:00
TODO.txt More validator work 2014-08-28 07:53:41 -04:00
build.xml Lots of bugfixes, and narrative generator is started 2014-03-24 08:32:28 -04:00
pom.xml Merge branch 'versions' 2014-10-29 15:34:59 -04:00
pom.xml.versionsBackup More resource generation 2014-04-02 18:42:16 -04:00