jamesagnew 23de3c53b7 Merge branch 'issue50' ...

Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java

2014-11-17 14:41:27 -05:00

..

.settings

Let server return profile info if configured to do so

2014-08-21 00:34:19 -04:00

src

Merge branch 'issue50'

2014-11-17 14:41:27 -05:00

.classpath

Fix compile issues in previous merge

2014-11-08 11:18:04 -05:00

.gitignore

Getting profile generation working

2014-03-10 12:43:49 -04:00

.project

Get all of the tests passing again

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

pom.xml

Merging

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

pom.xml.orig

Merging

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

pom.xml.versionsBackup

More resource generation

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