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

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

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

.classpath

Work on HL7.org structs

2015-04-13 08:32:49 -04:00

.gitignore

Update license file generation and gitignores

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

.project

More work on struct integration

2015-02-16 11:33:46 -05:00

pom.xml

Work on HL7.org structs

2015-04-13 08:32:49 -04:00