From: Konstantin Dmitriev <ksee.zelgadis@gmail.com>
Date: Mon, 4 Oct 2010 11:58:27 +0000 (+0700)
Subject: Merge commit 'origin/master' into zelgadis_master
X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=commitdiff_plain;h=bb8e0ba8c1f78db22f6c8b8ce4e9b4f685749092

Merge commit 'origin/master' into zelgadis_master
---

bb8e0ba8c1f78db22f6c8b8ce4e9b4f685749092
diff --cc synfig-studio/images/Makefile.am
index 01e3c26,80b9920..5711c72
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@@ -177,21 -178,22 +178,21 @@@ IMAGES = 
  	sif_icon.$(EXT) \
  	synfig_icon.$(EXT) \
  	saveall_icon.$(EXT) \
- 	bool_icon.$(EXT) \
- 	integer_icon.$(EXT) \
- 	angle_icon.$(EXT) \
- 	segment_icon.$(EXT) \
- 	blinepoint_icon.$(EXT) \
- 	list_icon.$(EXT) \
- 	canvas_pointer_icon.$(EXT) \
- 	string_icon.$(EXT) \
+ 	type_bool_icon.$(EXT) \
+ 	type_integer_icon.$(EXT) \
+ 	type_angle_icon.$(EXT) \
+ 	type_segment_icon.$(EXT) \
+ 	type_blinepoint_icon.$(EXT) \
+ 	type_list_icon.$(EXT) \
+ 	type_canvas_icon.$(EXT) \
+ 	type_string_icon.$(EXT) \
  	eyedrop_icon.$(EXT) \
  	about_icon.$(EXT) \
 -	splash_screen1.$(EXT) \
 -	splash_screen2.$(EXT) \
 +	splash_screen.$(EXT) \
  	canvas_icon.$(EXT) \
- 	vector_icon.$(EXT) \
- 	real_icon.$(EXT) \
- 	color_icon.$(EXT) \
+ 	type_vector_icon.$(EXT) \
+ 	type_real_icon.$(EXT) \
+ 	type_color_icon.$(EXT) \
  	valuenode_icon.$(EXT) \
  	polygon_icon.$(EXT) \
  	bline_icon.$(EXT) \