kohsuke 3b7eb05e43 merged the RC branch back. This time I saw a lot of strange merge failures. Is svnmerge interfering with Subversion 1.6 somehow? ...

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19665 71c3de6d-444a-0410-be80-ed276b4c234a

2009-07-13 17:48:59 +00:00

..

src

[HUDSON-3933] Added a null check so that we can at least see the error message to identify what file is causing this.

2009-07-09 19:26:56 +00:00

assembly-uberjar-14.xml

license header clean up

2009-02-06 20:05:24 +00:00

logo.xcf

Merged jnlp-agent and remoting module, so that the JNLP like proactive connection mode is available through slave.jar

2008-09-17 19:51:56 +00:00

pom.xml

merged the RC branch back. This time I saw a lot of strange merge failures. Is svnmerge interfering with Subversion 1.6 somehow?

2009-07-13 17:48:59 +00:00