ICONLook

ICONlook: icon search engine from Download Squad by Jay Hathaway When it comes to tracking down some icons for a project — nothing real fancy, and preferably under some kind of open license — image searching on Google doesn’t always do the trick. ICONLook is a search site that you can try instead: it’s specifically for icons, and it has some useful features that make it worth a peek if you’re in a pinch. These are generally OS-type icons, for stuff like apps, documents and search buttons, so don’t get your hopes up for anything too fanciful. Heck, we couldn’t even find anything as wild and crazy as a cat icon on ICONLook. Selection is not ICONLook’s strong point. Even within the categories it’s designed for, there’s not a lot of variety. On the plus side, many of the icons are available in a number of different sizes, and there are links to the source and the license for each one. This puts to rest any worries that this might be some kind of hack job, or the work of nefarious icon pirates. Instead, what you get is a legitimate, middle of the road selection of licensed icons that will hopefully expand to become more useful.

[How to] Merge branches in eclipse

1- Select Team – Merge

d
<!–[if gte vml 1]><v:shapetype
id=”_x0000_t75″ coordsize=”21600,21600″ o:spt=”75″ o:preferrelative=”t”
path=”m@4@5l@4@11@9@11@9@5xe” filled=”f” stroked=”f”>

<v:shape id=”_x0000_i1025″ type=”#_x0000_t75″ style=’width:414.75pt;
height:250.5pt’>
<v:imagedata src=”file:///C:\DOCUME~1\AHMEDA~1\LOCALS~1\Temp\msohtmlclip11\clip_image001.png”
o:title=”"/>
<![endif]–>

2- The merge wizard open as shown:

<!–[if gte vml 1]><v:shape id=”_x0000_i1026″
type=”#_x0000_t75″ style=’width:342.75pt;height:333pt’>
<v:imagedata src=”file:///C:\DOCUME~1\AHMEDA~1\LOCALS~1\Temp\msohtmlclip11\clip_image003.png”
o:title=”"/>
<![endif]–>

3- In the first field (Branch or
version to be merged (end tag)), select browse and select the latest tag for
the main trunk (in this case, dot16e_main_trunk_build_0001), then press OK.

<!–[if gte vml 1]><v:shape id=”_x0000_i1027″
type=”#_x0000_t75″ style=’width:337.5pt;height:243.75pt’>
<v:imagedata src=”file:///C:\DOCUME~1\AHMEDA~1\LOCALS~1\Temp\msohtmlclip11\clip_image005.png”
o:title=”"/>
<![endif]–>

4- For the second field, select
browse and choose the tag you have just made (the latest tag for your branch).

<!–[if gte vml 1]><v:shape id=”_x0000_i1028″
type=”#_x0000_t75″ style=’width:337.5pt;height:243.75pt’>
<v:imagedata src=”file:///C:\DOCUME~1\AHMEDA~1\LOCALS~1\Temp\msohtmlclip11\clip_image007.png”
o:title=”"/>
<![endif]–>

5- Now, you have selected the
start and end tags for the merge process

<!–[if gte vml 1]><v:shape id=”_x0000_i1029″
type=”#_x0000_t75″ style=’width:342.75pt;height:333pt’>
<v:imagedata src=”file:///C:\DOCUME~1\AHMEDA~1\LOCALS~1\Temp\msohtmlclip11\clip_image009.png”
o:title=”"/>
<![endif]–>

You now have two options as shown
in the above dialog

<!–[if gte vml 1]><v:shape id=”_x0000_i1030″
type=”#_x0000_t75″ style=’width:319.5pt;height:36pt’>
<v:imagedata src=”file:///C:\DOCUME~1\AHMEDA~1\LOCALS~1\Temp\msohtmlclip11\clip_image011.png”
o:title=”"/>
<![endif]–>

The first option lets you approve
changes that will be made to your branch while the second option performs merge
automatically and then you fix conflicts manually.

The First option is
recommended while merging to save the updates made to your local branch.