Changeset 529627b


Ignore:
Timestamp:
10/24/13 07:08:10 (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
4f9718b
Parents:
0a4a3ac (diff), ca968ed7 (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:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/lp-gui/LPMain.ui

    r6a2483b rca968ed7  
    365365        </item> 
    366366       </layout> 
    367        <zorder></zorder> 
    368        <zorder></zorder> 
    369367       <zorder>line_2</zorder> 
    370368       <zorder>treeView</zorder> 
  • src-sh/pbi-manager10/pbi-manager

    r39079340 r0a4a3ac  
    39703970                cat "${i}" \ 
    39713971                | sed "s|%%PBI_EXEDIR%%|$PBI_PROGDIRPATH/$PBI_FAKEBIN_DIR|g" \ 
    3972                 | sed "s|%%PBI_APPDIR%%|$PBI_PROGDIRPATH|g" \ 
     3972                | sed "s|%%PBI_APPDIR%%|${PBI_PROGDIRPATH}/local|g" \ 
    39733973                > "${dir}/PBI-${i}" 
    39743974 
     
    40144014                cat "${i}" \ 
    40154015                | sed "s|%%PBI_EXEDIR%%|$PBI_PROGDIRPATH/$PBI_FAKEBIN_DIR|g" \ 
    4016                 | sed "s|%%PBI_APPDIR%%|$PBI_PROGDIRPATH|g" \ 
     4016                | sed "s|%%PBI_APPDIR%%|${PBI_PROGDIRPATH}/local|g" \ 
    40174017                > "${dir}/PBI-${i}" 
    40184018 
     
    40284028                        cat "${dirfile}.directory" \ 
    40294029                        | sed "s|%%PBI_EXEDIR%%|$PBI_PROGDIRPATH/$PBI_FAKEBIN_DIR|g" \ 
    4030                         | sed "s|%%PBI_APPDIR%%|$PBI_PROGDIRPATH|g" \ 
     4030                        | sed "s|%%PBI_APPDIR%%|${PBI_PROGDIRPATH}/local|g" \ 
    40314031                        > "${dir}/PBI-${dirfile}.directory" 
    40324032                        #cp "${dirfile}.directory" "${dir}/PBI-${dirfile}.directory" 
Note: See TracChangeset for help on using the changeset viewer.