don't comment out the lines to dist the packer example, just simply remove

2002-02-18  Manish Singh  <yosh@gimp.org>

        * Makefile.am: don't comment out the lines to dist the packer
        example, just simply remove it. (the continuation line confused
        make even though it was in the comment, barf)

diff --git a/ChangeLog b/ChangeLog
index 88722fe464885bdb652a08869b888c392bd7ab4c..0a968ba9c1b0496fb55c87377cef5b9589c39565 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-18  Manish Singh  <yosh@gimp.org>
+
+       * Makefile.am: don't comment out the lines to dist the packer
+       example, just simply remove it. (the continuation line confused
+       make even though it was in the comment, barf)
+
 Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popdown_list): Fix problems
@@ -5,6 +11,7 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
+>>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 88722fe464885bdb652a08869b888c392bd7ab4c..0a968ba9c1b0496fb55c87377cef5b9589c39565 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-02-18  Manish Singh  <yosh@gimp.org>
+
+       * Makefile.am: don't comment out the lines to dist the packer
+       example, just simply remove it. (the continuation line confused
+       make even though it was in the comment, barf)
+
 Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popdown_list): Fix problems
@@ -5,6 +11,7 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
+>>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88722fe464885bdb652a08869b888c392bd7ab4c..0a968ba9c1b0496fb55c87377cef5b9589c39565 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-02-18  Manish Singh  <yosh@gimp.org>
+
+       * Makefile.am: don't comment out the lines to dist the packer
+       example, just simply remove it. (the continuation line confused
+       make even though it was in the comment, barf)
+
 Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popdown_list): Fix problems
@@ -5,6 +11,7 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
+>>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 88722fe464885bdb652a08869b888c392bd7ab4c..0a968ba9c1b0496fb55c87377cef5b9589c39565 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-02-18  Manish Singh  <yosh@gimp.org>
+
+       * Makefile.am: don't comment out the lines to dist the packer
+       example, just simply remove it. (the continuation line confused
+       make even though it was in the comment, barf)
+
 Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popdown_list): Fix problems
@@ -5,6 +11,7 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
+>>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 88722fe464885bdb652a08869b888c392bd7ab4c..0a968ba9c1b0496fb55c87377cef5b9589c39565 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-02-18  Manish Singh  <yosh@gimp.org>
+
+       * Makefile.am: don't comment out the lines to dist the packer
+       example, just simply remove it. (the continuation line confused
+       make even though it was in the comment, barf)
+
 Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popdown_list): Fix problems
@@ -5,6 +11,7 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
+>>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88722fe464885bdb652a08869b888c392bd7ab4c..0a968ba9c1b0496fb55c87377cef5b9589c39565 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-02-18  Manish Singh  <yosh@gimp.org>
+
+       * Makefile.am: don't comment out the lines to dist the packer
+       example, just simply remove it. (the continuation line confused
+       make even though it was in the comment, barf)
+
 Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popdown_list): Fix problems
@@ -5,6 +11,7 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
+>>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88722fe464885bdb652a08869b888c392bd7ab4c..0a968ba9c1b0496fb55c87377cef5b9589c39565 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-02-18  Manish Singh  <yosh@gimp.org>
+
+       * Makefile.am: don't comment out the lines to dist the packer
+       example, just simply remove it. (the continuation line confused
+       make even though it was in the comment, barf)
+
 Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popdown_list): Fix problems
@@ -5,6 +11,7 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
+>>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/Makefile.am b/Makefile.am
index 73681d0aa89ee9dcfb901eff2008dbb75a74e514..d126a78dd60ba3b7d72d9ca8357fe8334f198932 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,9 +113,6 @@ EXTRA_DIST =                        \
        examples/spinbutton/Makefile  \
        examples/find-examples.sh
 
-#      examples/packer/Makefile  \
-#      examples/packer/pack.c  \
-
 GDKTARGET=@gdktarget@
 
 ## Copy .pc files to target-specific names