Changeset 087ecf0


Ignore:
Timestamp:
05/16/14 09:00:54 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
10544d5
Parents:
754bfae6
Message:

Fix a bunch of broken modules

Location:
pbi-modules/audio
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pbi-modules/audio/libmpd/pbi.conf

    r1f3acab r087ecf0  
    1010# -- Additional repo information (optional) -- 
    1111PBI_LICENSE="" 
    12 <<<<<<< HEAD 
    1312PBI_TAGS="libmpdclient,abstraction" 
    14 ======= 
    15 PBI_TAGS="libmpd,mpd" 
    16 >>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    1713PBI_PROGTYPE="Text" 
    1814PBI_CATEGORY="Audio" 
  • pbi-modules/audio/libmpdclient/pbi.conf

    r1f3acab r087ecf0  
    1010# -- Additional repo information (optional) -- 
    1111PBI_LICENSE="" 
    12 <<<<<<< HEAD 
    1312PBI_TAGS="C++,language.MPD" 
    14 ======= 
    15 PBI_TAGS="C++,objective,C,MPD" 
    16 >>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    1713PBI_PROGTYPE="Text" 
    1814PBI_CATEGORY="Audio" 
     
    2824 
    2925# -- Other PBIs which are similar to this PBI 
    30 <<<<<<< HEAD 
    31 PBI_RELATED="audio/ario" 
    32 ======= 
    3326PBI_RELATED="audio/ario audio/mpc" 
    34 >>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    3527 
    3628export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
  • pbi-modules/audio/libmusicbrainz3/pbi.conf

    r1f3acab r087ecf0  
    2424 
    2525# -- Other PBIs which are similar to this PBI 
    26 <<<<<<< HEAD 
    2726PBI_RELATED="audio/rhythmbox" 
    28 ======= 
    29 PBI_RELATED="audio/rythmbox" 
    30 >>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    3127 
    3228export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
  • pbi-modules/audio/libmusicbrainz5/pbi.conf

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

    r1f3acab r087ecf0  
    1010# -- Additional repo information (optional) -- 
    1111PBI_LICENSE="BSD" 
    12 <<<<<<< HEAD 
    13 PBI_TAGS="creative,nomad" 
    14 ======= 
    1512PBI_TAGS="C,library,API" 
    16 >>>>>>> 21a7b8813c28f39c5a0ca515dc3056d47fdd3112 
    1713PBI_PROGTYPE="Text" 
    1814PBI_CATEGORY="Audio" 
Note: See TracChangeset for help on using the changeset viewer.