Changeset 24b5d94


Ignore:
Timestamp:
04/25/14 07:07:16 (17 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2, stable/10
Children:
7cce88b2
Parents:
ad3a427 (diff), 3ef1a66 (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:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • lumina/lumina-desktop/fluxboxconf/fluxbox-init-rc

    rf06effb r3ef1a66  
    5959session.screen0.maxDisableResize:       false 
    6060session.screen0.autoRaise:      true 
    61 session.screen0.allowRemoteActions:     true 
     61session.screen0.allowRemoteActions:     false 
    6262session.screen0.tooltipDelay:   500 
    6363session.screen0.colPlacementDirection:  TopToBottom 
  • src-qt4/about-gui/mainwindow.cpp

    r4ec8d04 rad3a427  
    9999        PkgSet+=QString(" ") + tr("(unstable)"); 
    100100    } 
     101    if (PkgSet.toUpper().trimmed() == "CUSTOM") 
     102    { 
     103        PkgSet="CUSTOM"; 
     104        QString PkgUrl; 
     105        PkgUrl = pcbsd::Utils::getValFromPCBSDConf("PACKAGE_URL"); 
     106        ui->PkgSetLabel->setToolTip(PkgUrl); 
     107    } 
    101108    ui->PkgSetLabel->setText(PkgSet); 
    102109 
Note: See TracChangeset for help on using the changeset viewer.