Jason van Zyl ebf2e4ddea Merge branch 'eclipse-aether' of github.com:tesla/tesla-build into eclipse-aether ... Conflicts: .gitignore pom.xml		2013-03-14 13:03:31 -07:00
..
src	Merge branch 'eclipse-aether' of github.com:tesla/tesla-build into eclipse-aether	2013-03-14 13:03:31 -07:00
pom.xml	Use Eclipse/Sisu 0.0.0.M2 milestone	2013-03-13 08:49:00 -04:00