pop

diff --git a/meta b/meta
index 9f90fbb95ff446c11cb49b168bb115f26eb159a4..551fbd93176a3360c8992ab11f0896b10f6b1e58 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 554954c3cd68e5983eda956ee8bcc617cdcc0c2d
-Head: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
+Previous: 71917fd441008d1d5e8ff8f3df53def22206c7b0
+Head: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -15,7 +15,7 @@ Applied:
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
   acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
+  show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
 Unapplied:
-  show_err: b0d033ea75904f706f93942cd281875b1c5e28f5
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37
 Hidden:

diff --git a/patches/show_err b/patches/show_err
index 723e270454176a3dc3ea49e10129b28c019e92ed..5fc5cbfe1be84455983a06af48c71dd7ce4a2083 100644 (file)
--- a/patches/show_err
+++ b/patches/show_err
@@ -1,5 +1,5 @@
-Bottom: 1a6976aae5afc51f4482c9392f83f24867e54446
-Top:    cd2d286a70aa18e04c78f6a86a6ce9d0b4056017
+Bottom: 9fdabc325eba3a5ebf30ecea2f042a5c6f338ef4
+Top:    32a7b8b2ffc23b410dc19c50a9bf68e149662635
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 07:58:54 -0800
 
@@ -54,7 +54,7 @@ index a75ef34..7e1ca5e 100644
                printf("SA verification: success\n");
  
 diff --git a/src/libacm.c b/src/libacm.c
-index d32e749..57036bc 100644
+index ee8c07b..c59a8fb 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -35,6 +35,7 @@