Changeset ddd6a120


Ignore:
Timestamp:
09/12/13 12:22:20 (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
Children:
6b017ea
Parents:
de39bc3b (diff), 4ba4baf (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/pc-softwaremanager/mainUI.cpp

    rda39501 r4ba4baf  
    455455  QString cmd = "xdg-open "+desktopfile; 
    456456  //Startup the command externally 
    457   QProcess::startDetached(cmd); 
     457  QProcess::execute(cmd); 
    458458} 
    459459 
  • src-sh/lpreserver/lpreserver

    rc0e6494 rde39bc3b  
    408408           listsnap) help_listsnap ;; 
    409409           revertsnap) help_revertsnap ;; 
    410            zpool) help_zpol ;; 
     410           zpool) help_zpool ;; 
    411411           replicate) help_replicate ;; 
    412412           cronsnap) help_cronsnap ;; 
Note: See TracChangeset for help on using the changeset viewer.