From: frank Date: Sat, 2 Jun 2012 22:21:22 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=9b06fb6a099e6634614d82ed11a39a197403e766;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 e3d419a2..389d925b 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-05-22 22:35 +# Written by cupsd on 2012-05-31 21:52 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:7ae9b14e-20ad-3628-427d-870cdf4cdea4 diff --git a/portage/package.use b/portage/package.use index ed090b0e..b6b1ac13 100644 --- a/portage/package.use +++ b/portage/package.use @@ -177,6 +177,7 @@ media-sound/jack-audio-connection-kit jack-tmpfs netjack media-sound/pulseaudio asyncns equalizer media-sound/sox amrnb amrwb +media-video/dvdrip subtitles media-video/ffmpeg aac aacplus amr ass dirac faac faad gsm hardcoded-tables network opencore-amr openssl rtmp schroedinger vaapi vhook vpx media-video/kino gpac media-video/mjpegtools yv12