DESCRIPTION

Merge branch 'stable-3.0'

* stable-3.0:
  Decorate repositories view logo
  [repoView] Make "Delete Repository..." more explicit
  Make sure Comparator implementation does not violate contract
  Fix NPE in CommitMessageComponent#setDefaults
  [repoView] Ask whether to remove/delete repo when pressing Delete
  Fix instability in MergeToolTest
  Don't automatically connect projects in /, /home or /home/username
  Extract method in AutoShareProjects to reduce nesting
  Extend labels of sources in Import Projects from Git
  Fix potential NPE from passing null as progress monitor
  Consider IResource.getLocation() being null
  Fix scheduling rule error when ignoring resources in nested projects
  Update build to use Tycho 0.18
  Update target platform to use Jetty 7.6.11
  Fix NPE when selecting filediff in a merge commit
  Auto share multiple projects in single job
  Fix version.sh to correctly modify dependencies

Conflicts:
	org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java
	org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitMessageComponent.java
	pom.xml

Change-Id: Ic243c8ed89f6155b1d0c5b698536c6cb278b74fb
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2013-08-23 14:06:34.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/4828/

-------------------------------------
author: Brenden Conley
date: 2013-08-23 14:20:56.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/4828/ : UNSTABLE

-------------------------------------
