Changeset 14505e8


Ignore:
Timestamp:
03/05/14 10:55:59 (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
8d73b92
Parents:
29ca147 (diff), 3a00741 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Location:
src-qt4
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/port-files/pkg-plist

    rd429f4f r2761d27  
    5252share/pcbsd/xstartup/life-preserver.sh 
    5353share/pcbsd/xstartup/screensaver.sh 
     54share/pcbsd/xstartup/startpulseaudio.sh 
    5455share/pcbsd/xstartup/vkeyboard.sh 
    5556share/pcbsd/xstartup/setmix.sh 
  • src-qt4/pc-cupscfg/pc-cupscfg

    r1620346 r29ca147  
    33# License: BSD 
    44 
     5#Check if the HPLIP ppd files are also available, and link them into the CUPS database 
     6if [ -e /usr/local/share/ppd/HP ]; then 
     7  ln -sf /usr/local/share/ppd/HP /usr/local/share/cups/model/HPLIP 
     8elif [ -e /usr/local/share/cups/model/HPLIP ]; then 
     9  rm /usr/local/share/cups/model/HPLIP 
     10fi 
    511user=$1 
    612 
Note: See TracChangeset for help on using the changeset viewer.