Changeset f2e74ea


Ignore:
Timestamp:
Aug 2, 2013 6:22:13 AM (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
a8c8e8e
Parents:
d5046fd (diff), c1c46d8 (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
1 edited

Legend:

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

    r6b3b3fb rd5046fd  
    4242bin/xorg-startupcheck 
    4343sbin/PCDMd 
     44sbin/PCDM-xloop 
    4445share/pcbsd/xstartup/enable-ibus.sh 
    4546share/pcbsd/xstartup/checkupdater.sh 
     
    8081share/pcbsd/icons/preferences-desktop.png 
    8182share/pcbsd/icons/gvim.png 
     83share/pcbsd/icons/sysupdate.png 
     84share/pcbsd/icons/pkgmanager.png 
    8285share/pcbsd/doc/handbook_en.pdf 
    8386share/wallpapers/pcbsd9-default/contents/images/1024x768.jpg 
     
    357360share/pcbsd/pc-systemupdatertray/images/connecterror.png 
    358361share/pcbsd/pc-systemupdatertray/images/go-down.png 
     362share/pcbsd/pc-systemupdatertray/images/appcafe.png 
     363share/pcbsd/pc-systemupdatertray/images/pkgmanager.png 
     364share/pcbsd/pc-systemupdatertray/images/pkgupdates.png 
    359365share/pcbsd/pc-systemupdatertray/images/pbiupdates.png 
    360366share/pcbsd/pc-systemupdatertray/images/restart.png 
     
    364370share/pcbsd/pc-systemupdatertray/images/updated.png 
    365371share/pcbsd/pc-systemupdatertray/images/updating.png 
     372share/pcbsd/pc-systemupdatertray/images/warden.png 
    366373share/pcbsd/pc-systemupdatertray/images/working.png 
     374share/pcbsd/pc-systemupdatertray/images/view-refresh.png 
    367375share/pcbsd/pc-sounddetect/soundcards.xml 
    368376share/pcbsd/pc-netmanager/umts_stick 
     
    864872share/pcbsd/i18n/pc-bluetoothtray_ar.qm 
    865873share/pcbsd/i18n/pc-bluetoothtray_zu.qm 
    866 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_af.qm 
    867 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_ar.qm 
    868 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_az.qm 
    869 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_bg.qm 
    870 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_bn.qm 
     874share/pcbsd/i18n/pc-bootconfig_af.qm 
     875share/pcbsd/i18n/pc-bootconfig_ar.qm 
     876share/pcbsd/i18n/pc-bootconfig_az.qm 
     877share/pcbsd/i18n/pc-bootconfig_bg.qm 
     878share/pcbsd/i18n/pc-bootconfig_bn.qm 
    871879share/pcbsd/i18n/pc-bootconfig_bs.qm 
    872880share/pcbsd/i18n/pc-bootconfig_ca.qm 
     
    25552563share/applications/pccontrol.desktop 
    25562564share/applications/pcbugreport.desktop 
    2557 share/applications/pc-gdmconf.desktop 
    25582565share/applications/pcbsd-pbi.desktop 
    25592566share/applications/defaults.list 
     
    25612568share/applications/pcbsdpbu.desktop 
    25622569share/applications/pc-pkgmanager.desktop 
     2570share/applications/pc-updategui.desktop 
     2571share/applications/pcgdmconf.desktop 
    25632572share/applications/pc-welcome.desktop 
    25642573share/applications/warden.desktop 
    25652574share/applications/EasyPBI.desktop 
     2575share/gnome/apps/pcbsd-pbi.desktop 
    25662576lib/libpcbsd-ui.so.0.9.8 
    25672577lib/libpcbsd-ui.so 
Note: See TracChangeset for help on using the changeset viewer.