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

Versions now builds completely!

2014-10-24 15:43:35 -04:00

src

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

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

testmindeps

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

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

.classpath

Add suport for composite and sorting to JPA (not yet complete)

2014-07-29 09:10:25 -04:00

.gitignore

Merging

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

.project

Fix a number of unit tests

2014-07-02 15:24:29 -04:00

build.xml

Lots of bugfixes, and narrative generator is started

2014-03-24 08:32:28 -04:00

pom.xml

Tagging and deploying 0.8

2014-12-17 14:22:10 -05:00

pom.xml.versionsBackup

More resource generation

2014-04-02 18:42:16 -04:00

TODO.txt

More validator work

2014-08-28 07:53:41 -04:00