Olivier Lamy 24eb579d0c Merge branch 'master' of https://github.com/mpeltonen/jenkins ...

And fix my previous bad push.
I apologize folks !! my bad :-(

Conflicts:
	changelog.html
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java

2011-02-10 16:30:33 +01:00

..

java/org/jvnet/hudson/test

Merge branch 'master' of https://github.com/mpeltonen/jenkins

2011-02-10 16:30:33 +01:00

preset-data

dos2unix for text files in repo (minus plugins/). SVN client on Windows should convert where needed.

2009-09-28 15:47:43 +00:00

resources

Add Spanish missing keys. Update Spanish internationalized values to have the word Jenkins instead of Hudson. Changes in translation tool to advise when a file have the Hudson word

2011-02-02 09:41:55 +01:00