DESCRIPTION

Place preference controls on single row

The merge tool and timeout preference value control were
previously on a row below the label controls.

This change places them on the same row to be consistent
with other groups displayed in the preference page.

Change-Id: I0060e8fe9dcb302784fa00e524630f2d80a606b3
Signed-off-by: Jaidyn Nichols xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2011-11-07 22:03:51.000000000

Uploaded patch set 2.

-------------------------------------
author: Douglas Trujillo
date: 2011-11-07 22:04:22.000000000

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

rebased

-------------------------------------
author: Douglas Trujillo
date: 2011-11-07 22:04:23.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Brenden Conley
date: 2011-11-07 22:22:39.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2011-11-07 22:38:21.000000000

Patch Set 2:

Build Unstable 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/1926/ : UNSTABLE

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