saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/printers.conf b/cups/printers.conf
index ed7dce88bffc8fe949cc068997948622bc4fa276..d094ea3ec37bce2bfc3f3eb4bd739cb38caedadd 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-29 20:16
+# Written by cupsd on 2012-03-12 07:10
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index c9666bc98a67b8491e298e58d49ea2559eb34da2..f1e1980518ee9078df99fd546a3e4d396e0664a1 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-29 08:18
+# Written by cupsd on 2012-03-11 10:35
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/make.conf b/make.conf
index a2116a9dc6525fc74314b948a6f055bc13ed7e32..37ba50ed14128a8002e4d6fb8a2306c5fe221341 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -30,6 +30,7 @@ ACCEPT_LICENSE=" \
        sun-bcla-java-vm \
        AdobeFlash-10 \
        AdobeFlash-10.1 \
+       AdobeFlash-10.3 \
        skype-eula \
        Oracle-BCLA-JavaSE \
 "