Changeset 014ec4a


Ignore:
Timestamp:
03/06/14 10:07:27 (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
27b31a3
Parents:
56e22d3 (diff), d253ed4 (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

Files:
3 added
2 edited

Legend:

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

    r2761d27 rd253ed4  
    490490share/pcbsd/pc-controlpanel/icons/pc-controlpanel64x64.png 
    491491share/pcbsd/pc-controlpanel/icons/pc-controlpanel.png 
     492share/pcbsd/pc-controlpanel/icons/pulseaudio.png 
    492493share/pcbsd/pc-controlpanel/icons/cups-icon.png 
    493494share/pcbsd/pc-controlpanel/items/system/pc-bootconfig.desktop 
     
    540541share/pcbsd/pc-controlpanel/items/de/xfce4-thunar-settings.desktop 
    541542share/pcbsd/pc-controlpanel/items/hardware/pc-soundconfig.desktop 
     543share/pcbsd/pc-controlpanel/items/hardware/pc-paprefs.desktop 
     544share/pcbsd/pc-controlpanel/items/hardware/pc-pavucontrol.desktop 
    542545share/pcbsd/pc-controlpanel/items/hardware/pc-zmanager.desktop 
    543546share/pcbsd/pc-controlpanel/items/hardware/lxde-lxinput.desktop 
  • build-files/conf/port-make.conf

    r59332ba r56e22d3  
    5252denemo_SET=LILYPOND 
    5353dovecot_SET=MYSQL PGSQL SQLITE LDAP 
     54espeak_UNSET=PORTAUDIO 
    5455easytag_SET=WAVEPACK 
    5556evolution_SET=SPAMASSASSIN 
     
    8182libreoffice_SET=SYSTRAY 
    8283libxine_SET=LIBBLURAY VAAPI WAVPACK SMB XVMC 
     84libxul_UNSET=ALSA 
    8385linux-defcon_SET=NVIDIA 
    8486lyx_SET=ASPELL 
Note: See TracChangeset for help on using the changeset viewer.