Changeset 58b73e1


Ignore:
Timestamp:
08/02/13 06:32:37 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
867747a
Parents:
bc2ee32a (diff), a8c8e8e (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

Conflicts:

src-qt4/port-files/pkg-plist

Location:
src-qt4
Files:
1 added
2 edited

Legend:

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

    rbc2ee32a r58b73e1  
    4242bin/xorg-startupcheck 
    4343sbin/PCDMd 
     44sbin/PCDM-xloop 
    4445share/pcbsd/xstartup/enable-ibus.sh 
    4546share/pcbsd/xstartup/checkupdater.sh 
     
    8182share/pcbsd/icons/gvim.png 
    8283share/pcbsd/icons/pc-bootconfig.png 
     84share/pcbsd/icons/sysupdate.png 
     85share/pcbsd/icons/pkgmanager.png 
    8386share/pcbsd/doc/handbook_en.pdf 
    8487share/wallpapers/pcbsd9-default/contents/images/1024x768.jpg 
     
    358361share/pcbsd/pc-systemupdatertray/images/connecterror.png 
    359362share/pcbsd/pc-systemupdatertray/images/go-down.png 
     363share/pcbsd/pc-systemupdatertray/images/appcafe.png 
     364share/pcbsd/pc-systemupdatertray/images/pkgmanager.png 
     365share/pcbsd/pc-systemupdatertray/images/pkgupdates.png 
    360366share/pcbsd/pc-systemupdatertray/images/pbiupdates.png 
    361367share/pcbsd/pc-systemupdatertray/images/restart.png 
     
    365371share/pcbsd/pc-systemupdatertray/images/updated.png 
    366372share/pcbsd/pc-systemupdatertray/images/updating.png 
     373share/pcbsd/pc-systemupdatertray/images/warden.png 
    367374share/pcbsd/pc-systemupdatertray/images/working.png 
     375share/pcbsd/pc-systemupdatertray/images/view-refresh.png 
    368376share/pcbsd/pc-sounddetect/soundcards.xml 
    369377share/pcbsd/pc-netmanager/umts_stick 
     
    407415share/pcbsd/pc-controlpanel/icons/pc-controlpanel.png 
    408416share/pcbsd/pc-controlpanel/icons/cups-icon.png 
     417share/pcbsd/pc-controlpanel/items/system/pc-bootconfig.desktop 
    409418share/pcbsd/pc-controlpanel/items/system/pbi-thefish.desktop 
    410419share/pcbsd/pc-controlpanel/items/system/pc-dmconf.desktop 
     
    865874share/pcbsd/i18n/pc-bluetoothtray_ar.qm 
    866875share/pcbsd/i18n/pc-bluetoothtray_zu.qm 
    867 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_af.qm 
    868 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_ar.qm 
    869 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_az.qm 
    870 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_bg.qm 
    871 share/pcbsd/share/pcbsd/i18n/pc-bootconfig_bn.qm 
     876share/pcbsd/i18n/pc-bootconfig_af.qm 
     877share/pcbsd/i18n/pc-bootconfig_ar.qm 
     878share/pcbsd/i18n/pc-bootconfig_az.qm 
     879share/pcbsd/i18n/pc-bootconfig_bg.qm 
     880share/pcbsd/i18n/pc-bootconfig_bn.qm 
    872881share/pcbsd/i18n/pc-bootconfig_bs.qm 
    873882share/pcbsd/i18n/pc-bootconfig_ca.qm 
     
    25562565share/applications/pccontrol.desktop 
    25572566share/applications/pcbugreport.desktop 
    2558 share/applications/pc-gdmconf.desktop 
    25592567share/applications/pcbsd-pbi.desktop 
    25602568share/applications/defaults.list 
     
    25622570share/applications/pcbsdpbu.desktop 
    25632571share/applications/pc-pkgmanager.desktop 
     2572share/applications/pc-updategui.desktop 
     2573share/applications/pcgdmconf.desktop 
    25642574share/applications/pc-welcome.desktop 
    25652575share/applications/warden.desktop 
    25662576share/applications/EasyPBI.desktop 
     2577share/gnome/apps/pcbsd-pbi.desktop 
    25672578lib/libpcbsd-ui.so.0.9.8 
    25682579lib/libpcbsd-ui.so 
  • src-qt4/pc-bootconfig/pc-bootconfig.pro

    reb2e9cc rbd1a1d26  
    8787dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
    8888 
    89 INSTALLS += target dotrans 
     89icons = pc-bootconfig.png 
     90icons.path=/usr/local/share/pcbsd/icons/ 
     91icons.extra=cp pc-bootconfig.png /usr/local/share/pcbsd/icons/pc-bootconfig.png 
     92 
     93INSTALLS += target icons dotrans 
Note: See TracChangeset for help on using the changeset viewer.