From: frank Date: Wed, 8 Feb 2012 10:07:46 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a6e55d757367ce41bf704d8e0707f5fee3fc379e;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 9901be2e..8304b163 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-04 19:00 +# Written by cupsd on 2012-02-08 08:32 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 5d8d28a8..6774f088 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-03 04:12 +# Written by cupsd on 2012-02-07 21:52 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/portage/package.keywords b/portage/package.keywords index 9aff1338..20d75928 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -1,4 +1,7 @@ +~dev-java/java-sdk-docs-1.7.0.2 +~dev-java/oracle-jdk-bin-1.7.0.2 +~dev-java/oracle-jre-bin-1.7.0.2 ~dev-java/sun-jdk-1.6.0.30 ~dev-java/sun-jre-bin-1.6.0.30 diff --git a/resolv.conf b/resolv.conf index 93a7dfad..9a19004e 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,6 +1,4 @@ -# Hand made by Frank Brehm +# Generated by net-scripts for interface eth0 domain brehm-online.com -search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de profitbricks.localdomain dc1.de.profitbricks.net -#nameserver 10.12.11.1 -nameserver 192.168.178.30 -nameserver 192.168.178.85 +search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de +nameserver 10.12.11.1