Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931

18 files changed, 16 insertions, 0 deletions

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index ba02344f43..e97397c5cc 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -2,10 +2,25 @@ NULL =
 
 public_icons = \
 	hicolor_apps_16x16_evolution.png \
+	hicolor_apps_16x16_evolution-mail.png \
+	hicolor_apps_16x16_evolution-memos.png \
+	hicolor_apps_16x16_evolution-tasks.png \
 	hicolor_apps_22x22_evolution.png \
+	hicolor_apps_22x22_evolution-mail.png \
+	hicolor_apps_22x22_evolution-memos.png \
+	hicolor_apps_22x22_evolution-tasks.png \
 	hicolor_apps_24x24_evolution.png \
+	hicolor_apps_24x24_evolution-mail.png \
+	hicolor_apps_24x24_evolution-memos.png \
+	hicolor_apps_24x24_evolution-tasks.png \
 	hicolor_apps_32x32_evolution.png \
+	hicolor_apps_32x32_evolution-mail.png \
+	hicolor_apps_32x32_evolution-memos.png \
+	hicolor_apps_32x32_evolution-tasks.png \
 	hicolor_apps_48x48_evolution.png \
+	hicolor_apps_48x48_evolution-mail.png \
+	hicolor_apps_48x48_evolution-memos.png \
+	hicolor_apps_48x48_evolution-tasks.png \
 	hicolor_apps_scalable_evolution.svg \
 	$(NULL)
 
@@ -49,6 +64,7 @@ private_icons = \
 	hicolor_categories_48x48_preferences-composer.png \
 	hicolor_categories_48x48_preferences-mail.png \
 	hicolor_categories_48x48_preferences-mail-accounts.png \
+	hicolor_categories_48x48_preferences-system-network-proxy.png \
 	hicolor_places_16x16_mail-inbox.png \
 	hicolor_places_16x16_mail-outbox.png \
 	hicolor_places_16x16_mail-sent.png \
diff --git a/data/icons/hicolor_actions_24x24_query-free-busy.png b/data/icons/hicolor_actions_24x24_query-free-busy.png
new file mode 100644
index 0000000000..228c4a5b07
--- /dev/null
+++ b/data/icons/hicolor_actions_24x24_query-free-busy.png
diff --git a/data/icons/hicolor_apps_16x16_evolution-mail.png b/data/icons/hicolor_apps_16x16_evolution-mail.png
new file mode 100644
index 0000000000..652d919c0a
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_evolution-mail.png
diff --git a/data/icons/hicolor_apps_16x16_evolution-memos.png b/data/icons/hicolor_apps_16x16_evolution-memos.png
new file mode 100644
index 0000000000..ad4f90064c
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_evolution-memos.png
diff --git a/data/icons/hicolor_apps_16x16_evolution-tasks.png b/data/icons/hicolor_apps_16x16_evolution-tasks.png
new file mode 100644
index 0000000000..b8faae63ae
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_evolution-tasks.png
diff --git a/data/icons/hicolor_apps_22x22_evolution-mail.png b/data/icons/hicolor_apps_22x22_evolution-mail.png
new file mode 100644
index 0000000000..27f867e461
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_evolution-mail.png
diff --git a/data/icons/hicolor_apps_22x22_evolution-memos.png b/data/icons/hicolor_apps_22x22_evolution-memos.png
new file mode 100644
index 0000000000..f03b6ab05b
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_evolution-memos.png
diff --git a/data/icons/hicolor_apps_22x22_evolution-tasks.png b/data/icons/hicolor_apps_22x22_evolution-tasks.png
new file mode 100644
index 0000000000..3c0db1dcc5
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_evolution-tasks.png
diff --git a/data/icons/hicolor_apps_24x24_evolution-mail.png b/data/icons/hicolor_apps_24x24_evolution-mail.png
new file mode 100644
index 0000000000..876715661a
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_evolution-mail.png
diff --git a/data/icons/hicolor_apps_24x24_evolution-memos.png b/data/icons/hicolor_apps_24x24_evolution-memos.png
new file mode 100644
index 0000000000..11b3168d41
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_evolution-memos.png
diff --git a/data/icons/hicolor_apps_24x24_evolution-tasks.png b/data/icons/hicolor_apps_24x24_evolution-tasks.png
new file mode 100644
index 0000000000..14f6278c14
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_evolution-tasks.png
diff --git a/data/icons/hicolor_apps_32x32_evolution-mail.png b/data/icons/hicolor_apps_32x32_evolution-mail.png
new file mode 100644
index 0000000000..736a134d82
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_evolution-mail.png
diff --git a/data/icons/hicolor_apps_32x32_evolution-memos.png b/data/icons/hicolor_apps_32x32_evolution-memos.png
new file mode 100644
index 0000000000..a3c2bb12b2
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_evolution-memos.png
diff --git a/data/icons/hicolor_apps_32x32_evolution-tasks.png b/data/icons/hicolor_apps_32x32_evolution-tasks.png
new file mode 100644
index 0000000000..2d12fb51e3
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_evolution-tasks.png
diff --git a/data/icons/hicolor_apps_48x48_evolution-mail.png b/data/icons/hicolor_apps_48x48_evolution-mail.png
new file mode 100644
index 0000000000..33ad416682
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_evolution-mail.png
diff --git a/data/icons/hicolor_apps_48x48_evolution-memos.png b/data/icons/hicolor_apps_48x48_evolution-memos.png
new file mode 100644
index 0000000000..8bdc4b42d1
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_evolution-memos.png
diff --git a/data/icons/hicolor_apps_48x48_evolution-tasks.png b/data/icons/hicolor_apps_48x48_evolution-tasks.png
new file mode 100644
index 0000000000..694c921140
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_evolution-tasks.png
diff --git a/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png b/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png
new file mode 100644
index 0000000000..e3a4ce2887
--- /dev/null
+++ b/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png