no body parts

diff --git a/ChangeLog b/ChangeLog
index 438b5e3d7de2cc3a0720174d8c133f40ce4eb4a4..78c3c2e92d199cd6c636ba2edcd45aa91e7c5240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-22  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/stock_stop.png: no body parts
+       
 Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
@@ -363,6 +367,7 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
+>>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 438b5e3d7de2cc3a0720174d8c133f40ce4eb4a4..78c3c2e92d199cd6c636ba2edcd45aa91e7c5240 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-10-22  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/stock_stop.png: no body parts
+       
 Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
@@ -363,6 +367,7 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
+>>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 438b5e3d7de2cc3a0720174d8c133f40ce4eb4a4..78c3c2e92d199cd6c636ba2edcd45aa91e7c5240 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-10-22  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/stock_stop.png: no body parts
+       
 Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
@@ -363,6 +367,7 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
+>>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 438b5e3d7de2cc3a0720174d8c133f40ce4eb4a4..78c3c2e92d199cd6c636ba2edcd45aa91e7c5240 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-10-22  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/stock_stop.png: no body parts
+       
 Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
@@ -363,6 +367,7 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
+>>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 438b5e3d7de2cc3a0720174d8c133f40ce4eb4a4..78c3c2e92d199cd6c636ba2edcd45aa91e7c5240 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-10-22  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/stock_stop.png: no body parts
+       
 Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
@@ -363,6 +367,7 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
+>>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 438b5e3d7de2cc3a0720174d8c133f40ce4eb4a4..78c3c2e92d199cd6c636ba2edcd45aa91e7c5240 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-10-22  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/stock_stop.png: no body parts
+       
 Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
@@ -363,6 +367,7 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
+>>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 438b5e3d7de2cc3a0720174d8c133f40ce4eb4a4..78c3c2e92d199cd6c636ba2edcd45aa91e7c5240 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-10-22  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/stock_stop.png: no body parts
+       
 Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
@@ -363,6 +367,7 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
+>>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/gtk/stock-icons/stock_stop.png b/gtk/stock-icons/stock_stop.png
index 4beba47d95667132157f7c76cc8f4cf40ee4ccda..a87e59d16ab867dad70902e737459744b914fd16 100644 (file)
Binary files a/gtk/stock-icons/stock_stop.png and b/gtk/stock-icons/stock_stop.png differ

diff --git a/gtk/stock-icons/stock_stop_24.png b/gtk/stock-icons/stock_stop_24.png
index 4beba47d95667132157f7c76cc8f4cf40ee4ccda..a87e59d16ab867dad70902e737459744b914fd16 100644 (file)
Binary files a/gtk/stock-icons/stock_stop_24.png and b/gtk/stock-icons/stock_stop_24.png differ