Branch: master

6209a285 2014-11-20 23:39:52 Timothy Pearson
Fix unconverted exit icon
This relates to Bug 1313
M tdeui/kstdaction_p.h
diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h
index b89c32c..64ce47e 100644
--- a/tdeui/kstdaction_p.h
+++ b/tdeui/kstdaction_p.h
@@ -47,7 +47,7 @@
 	{ Print,         TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "document-print" },
 	{ PrintPreview,  TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "document-print-preview" },
 	{ Mail,          TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail-send" },
-	{ Quit,          TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" },
+	{ Quit,          TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "application-exit" },
 
 	{ Undo,          TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "edit-undo" },
 	{ Redo,          TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "edit-redo" },
41b81138 2014-11-20 23:40:13 Timothy Pearson
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdelibs
A pics/crystalsvg/cr16-mime-text-x-generic-new.png
A pics/crystalsvg/cr22-mime-text-x-generic-new.png
A pics/crystalsvg/cr32-mime-text-x-generic-new.png
A pics/crystalsvg/cr48-mime-text-x-generic-new.png
diff --git a/pics/crystalsvg/cr16-mime-text-x-generic-new.png b/pics/crystalsvg/cr16-mime-text-x-generic-new.png
new file mode 100644
index 0000000..84c4071
--- /dev/null
+++ b/pics/crystalsvg/cr16-mime-text-x-generic-new.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-mime-text-x-generic-new.png b/pics/crystalsvg/cr22-mime-text-x-generic-new.png
new file mode 100644
index 0000000..004ca03
--- /dev/null
+++ b/pics/crystalsvg/cr22-mime-text-x-generic-new.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-mime-text-x-generic-new.png b/pics/crystalsvg/cr32-mime-text-x-generic-new.png
new file mode 100644
index 0000000..6e838b3
--- /dev/null
+++ b/pics/crystalsvg/cr32-mime-text-x-generic-new.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-mime-text-x-generic-new.png b/pics/crystalsvg/cr48-mime-text-x-generic-new.png
new file mode 100644
index 0000000..49a8355
--- /dev/null
+++ b/pics/crystalsvg/cr48-mime-text-x-generic-new.png
Binary files differ