Changeset ff64089d


Ignore:
Timestamp:
05/14/14 10:30:29 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
e6e5ccdf
Parents:
0e4aca1 (diff), b53a01f (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:
6 added
10 edited

Legend:

Unmodified
Added
Removed
  • build-files/ports-overlay/misc/pcbsd-base/Makefile

    r50042c2 r66e7e97  
    116116                grub-mkconfig:${PORTSDIR}/sysutils/grub2 \ 
    117117                grub2-efi>=0:${PORTSDIR}/sysutils/grub2-efi \ 
    118                 preload:${PORTSDIR}/sysutils/preload \ 
    119118                vagrant>=0:${PORTSDIR}/sysutils/vagrant 
    120119 
  • build-files/ports-overlay/misc/pcbsd-meta-lxde/Makefile

    r138f3fe r21a7b88  
    1616                gvfs>=0:${PORTSDIR}/devel/gvfs \ 
    1717                xarchiver>=0:${PORTSDIR}/archivers/xarchiver \ 
     18                gtk-murrine-engine>=0:${PORTSDIR}/x11-themes/gtk-murrine-engine \ 
    1819                obkey>=0:${PORTSDIR}/x11-wm/obkey \ 
    1920                leafpad>=0:${PORTSDIR}/editors/leafpad \ 
  • build-files/ports-overlay/misc/pcbsd-meta-xfce/Makefile

    r138f3fe r21a7b88  
    1717                xfburn>=0:${PORTSDIR}/sysutils/xfburn \ 
    1818                ristretto>=0:${PORTSDIR}/graphics/ristretto \ 
     19                gtk-murrine-engine>=0:${PORTSDIR}/x11-themes/gtk-murrine-engine \ 
    1920                xfce4-wm-themes>=0:${PORTSDIR}/misc/xfce4-wm-themes \ 
    2021                xfce4-power-manager>=0:${PORTSDIR}/sysutils/xfce4-power-manager \ 
  • pbi-modules/audio/libmp3splt/pbi.conf

    r199189d r1f3acab  
    1010# -- Additional repo information (optional) -- 
    1111PBI_LICENSE="GPLv2" 
     12<<<<<<< HEAD 
     13PBI_TAGS="mp3,ogg,split" 
     14======= 
    1215PBI_TAGS="split,mp3,ogg" 
     16>>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    1317PBI_PROGTYPE="Text" 
    1418PBI_CATEGORY="Audio" 
  • pbi-modules/audio/libmpd/pbi.conf

    r199189d r1f3acab  
    1010# -- Additional repo information (optional) -- 
    1111PBI_LICENSE="" 
     12<<<<<<< HEAD 
     13PBI_TAGS="libmpdclient,abstraction" 
     14======= 
    1215PBI_TAGS="libmpd,mpd" 
     16>>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    1317PBI_PROGTYPE="Text" 
    1418PBI_CATEGORY="Audio" 
  • pbi-modules/audio/libmpdclient/pbi.conf

    r199189d r1f3acab  
    1010# -- Additional repo information (optional) -- 
    1111PBI_LICENSE="" 
     12<<<<<<< HEAD 
     13PBI_TAGS="C++,language.MPD" 
     14======= 
    1215PBI_TAGS="C++,objective,C,MPD" 
     16>>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    1317PBI_PROGTYPE="Text" 
    1418PBI_CATEGORY="Audio" 
     
    2428 
    2529# -- Other PBIs which are similar to this PBI 
     30<<<<<<< HEAD 
     31PBI_RELATED="audio/ario" 
     32======= 
    2633PBI_RELATED="audio/ario audio/mpc" 
     34>>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    2735 
    2836export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
  • pbi-modules/audio/libmusicbrainz3/pbi.conf

    r199189d r1f3acab  
    2424 
    2525# -- Other PBIs which are similar to this PBI 
     26<<<<<<< HEAD 
     27PBI_RELATED="audio/rhythmbox" 
     28======= 
    2629PBI_RELATED="audio/rythmbox" 
     30>>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    2731 
    2832export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
  • pbi-modules/audio/libmusicbrainz5/pbi.conf

    r199189d r1f3acab  
    1010# -- Additional repo information (optional) -- 
    1111PBI_LICENSE="LGPL21" 
     12<<<<<<< HEAD 
     13PBI_TAGS="musicbrainz,client,library" 
     14======= 
    1215PBI_TAGS="musicbrainz,database,access" 
     16>>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    1317PBI_PROGTYPE="Text" 
    1418PBI_CATEGORY="Audio" 
  • pbi-modules/audio/libnjb/pbi.conf

    r199189d r1f3acab  
    1010# -- Additional repo information (optional) -- 
    1111PBI_LICENSE="BSD" 
     12<<<<<<< HEAD 
     13PBI_TAGS="creative,nomad" 
     14======= 
    1215PBI_TAGS="C,library,API" 
     16>>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    1317PBI_PROGTYPE="Text" 
    1418PBI_CATEGORY="Audio" 
  • lumina/lumina-desktop/lumina-desktop.pro

    r7ae73d3 r0e4aca1  
    7474defaultbackground.path = /usr/local/share/Lumina-DE/ 
    7575 
    76 LIBS     += -L../libLumina -lLuminaUtils 
     76LIBS     = -L../libLumina -L/usr/local/lib -L/usr/lib -lLuminaUtils 
    7777 
    7878TRANSLATIONS =  i18n/lumina-desktop_af.ts \ 
Note: See TracChangeset for help on using the changeset viewer.