From: frank <frank@bruni.home.brehm-online.com>
Date: Mon, 12 Mar 2012 15:50:31 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=aab1f458bb691c0caa417f9664fae98147534dc2;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/cups/printers.conf b/cups/printers.conf
index ed7dce88..d094ea3e 100644
--- 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 c9666bc9..f1e19805 100644
--- 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 a2116a9d..37ba50ed 100644
--- 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 \
 "