jamesagnew b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs ...

Conflicts:
	hapi-fhir-android/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
	hapi-fhir-testpage-overlay/.gitignore
	src/changes/changes.xml

2015-04-21 13:30:58 -04:00

..

src/main

Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs

2015-04-21 13:30:58 -04:00

.classpath

Rebuild resource models

2014-07-29 15:59:11 -04:00

.gitignore

Update license file generation and gitignores

2015-03-26 11:57:07 -04:00

.project

Doc updates

2014-08-09 12:18:47 -04:00

pom.xml

Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs

2015-04-21 13:30:58 -04:00

pom.xml.versionsBackup

Get all of the tests passing again

2014-05-20 18:28:13 -04:00