From c3bdce97336f83a6492fc2e87cd0ae27e85bfc7b Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 16 Nov 2010 15:58:58 -0800 Subject: [PATCH] pop --- meta | 6 +++--- patches/logging | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta b/meta index 0f27d44..1b4a269 100644 --- a/meta +++ b/meta @@ -1,11 +1,11 @@ Version: 1 -Previous: 0fe769a1c18ad436c481e9f14fc0a8a1d780cd0b -Head: 7edfbc2207ea0ac16db75b6f21018e3f475feb67 +Previous: 134b1416bbf88f7a0f37c2844488bf3289ffa0e7 +Head: aed62ef01860aec397cc1197f488aacb20f554eb Applied: log_lid: 7edfbc2207ea0ac16db75b6f21018e3f475feb67 + logging: aed62ef01860aec397cc1197f488aacb20f554eb Unapplied: acm_snoop: 4241a1ee0838579443846233ba67f9f6464db855 - logging: 39170d53e725bd8dc493d1eea532c63fde504e61 dest_string: d911218a21a71d4efbdc2be76b1aa7c54aaecd4e loop: d1f7415495cfd5f46bd76214a4332706672b458a Hidden: diff --git a/patches/logging b/patches/logging index 7229406..25bb208 100644 --- a/patches/logging +++ b/patches/logging @@ -1,5 +1,5 @@ -Bottom: 153c0b75aa3160318662eb6a3073828158ada012 -Top: b8d3f4e6e728e572ac955117432908787521d3e7 +Bottom: ed807f7ce26b873b4c494f6c82a8dfa81761fe1c +Top: bf78bea11a38aa0ceb69815072cc4434b9da079b Author: Sean Hefty Date: 2010-11-15 14:08:15 -0800 @@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/acm.c b/src/acm.c -index 732f0e5..ba6644f 100644 +index 748ef58..0181373 100644 --- a/src/acm.c +++ b/src/acm.c @@ -37,6 +37,7 @@ -- 2.41.0