Merge trunk to the cpcmode5 branch. This gets us a more recent grafx2 with the cpcmode5 drawing. Now to make this mode optional so users can still work in regular mode :)

git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1719 416bcca6-2ee7-4201-b75f-2eb2f807beb1

src/operatio.h

@@ -225,3 +225,8 @@ void Centered_lines_0_3(void);
 void Centered_lines_12_7(void);
 void Centered_lines_0_7(void);
 
+/////////////////////////////////////////////////// OPERATION_RMB_COLORPICK
+
+byte Rightclick_colorpick(byte cursor_visible);
+void Rightclick_colorpick_2_1(void);
+void Rightclick_colorpick_0_1(void);