Changeset 2606fd9


Ignore:
Timestamp:
01/13/14 06:34:57 (8 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
258b7ff
Parents:
94237af (diff), efd1e98 (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 https://github.com/pcbsd/pcbsd

Location:
src-qt4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-sysmanager/backend.cpp

    re9a3917 rd9e7564  
    9292    //cmds << "rm -rf /usr/src/*"; info << "Removing the old source tree"; dirs << ""; //Clean the old ports tree 
    9393    cmds << "git init"; info << "Initialize GIT"; dirs << "/usr/src"; //setup git 
    94     cmds << "git remote remove origin"; info << ""; dirs <<"/usr/src"; //just in case it re-uses an old git setup 
    9594    cmds << "git remote add origin "+URL; info << ""; dirs << "/usr/src/.git"; //setup PC-BSD git repo 
    9695  } 
  • src-qt4/pc-controlpanel/items/software/pbi-winecfg.desktop

    rb8bb18a r94237af  
    22[Desktop Entry] 
    33PC-PBIName=wine 
    4 Exec=%PBI_PREFIX%/.sbin/winecfg 
     4Exec=%PBI_PREFIX%/bin/winecfg 
    55Type=Application 
    66Path=%PBI_PREFIX%/ 
    7 Icon=%PBI_PREFIX%/wine.png 
     7Icon=%PBI_PREFIX%/local/wine.png 
    88Name=Wine Configuration 
    99Name[af]=Wine Opset 
Note: See TracChangeset for help on using the changeset viewer.