SVN commit 430313 by page:

Add a 'sample merged' option to the colour picker tool.


 M  +2 -1      Makefile.am  
 M  +52 -37    kis_tool_colorpicker.cc  
 M  +7 -11     kis_tool_colorpicker.h  
 A             wdgcolorpicker.ui