Andrew Phillips 31398eb2e4 Merge branch 'json-client-cleanup' ... Conflicts: archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml		2010-03-20 14:39:42 +01:00
..
json-client-archetype	Merge branch 'json-client-cleanup'	2010-03-20 14:39:42 +01:00
.gitignore	Housekeeping: renamed all .svnignore files to .gitignore, and some line endings.	2010-03-19 11:30:13 +01:00
pom.xml	fixed version numbers to SNAPSHOT	2010-02-04 21:30:22 -08:00