mochaholic e4b5943314 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java

2015-04-09 07:24:40 -06:00

..

src

Merge remote-tracking branch 'origin/master'

2015-04-09 07:24:40 -06:00

testmindeps

Fix #135 - Remove Eclipse and IntelliJ artifacts from version control

2015-03-26 07:56:24 -04:00

.classpath

Documentation

2015-01-05 21:19:47 -05:00

.gitignore

Update license file generation and gitignores

2015-03-26 11:57:07 -04: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

Version bump a few dependencies

2015-03-17 08:11:42 -04: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