DESCRIPTION

Merge branch 'stable-2.2'

* stable-2.2:
  Fix incorrect decorations when ignored resources are created
  Add apache commons compress to target platform
  Fix NPE in GitModelSynchronizeParticipant#asCompareInput
  Update tracking branch when using "Push..." wizard
  Update tracking branch when using push ref wizard
  [sync] Update tracking branch when pushing
  Clean up test data after DualRepositoryTestCase tests
  Find nested projects when searching for project files
  Mark BranchResultDialog.buttonPressed() overridden
  Replace 'OK' with 'Cancel' on 'Checkout Conflicts' dialog

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


COMMENTS

author: Douglas Trujillo
date: 2012-12-16 22:55:16.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2012-12-16 22:55:22.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2012-12-16 23:08:22.000000000

Patch Set 2: Verified

Build Successful 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/3847/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2012-12-16 23:38:39.000000000

Patch Set 2: Looks good to me, approved; IP review completed



-------------------------------------
author: Douglas Trujillo
date: 2012-12-16 23:38:41.000000000

Change has been successfully merged into the git repository.

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