refresh

diff --git a/meta b/meta
index 02e0ed426a8d4eb9cb88e41d1e15fc1a03794874..4198d446d9fdf1f0495ab08a546f6e8f43ea29eb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: fc25d2211cc4fc31b7e07cd0b93f6f7887859344
-Head: 1e88e4202bbfeb069ecf26f6508c33686ed8f11d
+Previous: 7cdf1e643be78bc3e17ea3f899a2b21d185884a8
+Head: dd3019cb867e581e7032bfe17d60437b56b03a8b
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   daemon: 71bed462cc3d62031723ce0872b4e1de68861550
-  cfg: b09733181e36a5dcedf45dc827333ce454544afa
-  refresh-temp: 1e88e4202bbfeb069ecf26f6508c33686ed8f11d
+  cfg: dd3019cb867e581e7032bfe17d60437b56b03a8b
 Unapplied:
   log: cbe50bfc0ec5aa61f08083722d2b3d53791195a9
 Hidden:

diff --git a/patches/cfg b/patches/cfg
index ec21e67ec4cd7f9785b601b553f140a73a578747..0a7699ecf16a2c9df29d6818e68d3e9d877cbf90 100644 (file)
--- a/patches/cfg
+++ b/patches/cfg
@@ -1,5 +1,5 @@
 Bottom: 618c8524a45af7aa859abee4fa52733e6545dac9
-Top:    abe96573dde00ea8ceaed459ab3abf0f310754e7
+Top:    4c8ed082f31344149364323043339c69091f170d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:12:24 -0700
 
@@ -102,9 +102,7 @@ index 8b09453..535a755 100755
                        show_usage(argv[0]);
                        exit(1);
 diff --git a/src/acme.c b/src/acme.c
-old mode 100644
-new mode 100755
-index d9d9871..03e96ad
+index d9d9871..03e96ad 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -1,5 +1,5 @@

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c43988d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,12 +0,0 @@
-Bottom: abe96573dde00ea8ceaed459ab3abf0f310754e7
-Top:    4c8ed082f31344149364323043339c69091f170d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-29 10:18:15 -0700
-
-Refresh of cfg
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-old mode 100755
-new mode 100644