Andrew Phillips a18eb13d21 Merge branch 'issue178' ... Conflicts: archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml		2010-03-20 14:43:01 +01:00
..
compute-service-archetype	[issue 178] Added a Compute service template archetype.	2010-03-20 14:03:14 +01:00
json-client-archetype	Merge branch 'issue178'	2010-03-20 14:43:01 +01:00
.gitignore	Housekeeping: renamed all .svnignore files to .gitignore, and some line endings.	2010-03-19 11:30:13 +01:00
pom.xml	[issue 178] Added a Compute service template archetype.	2010-03-20 14:03:14 +01:00