Changeset d55a8b3


Ignore:
Timestamp:
01/23/14 08:20:09 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
5675b55
Parents:
be85a4e (diff), 1a4b7a1 (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:
6 edited

Legend:

Unmodified
Added
Removed
  • overlays/install-overlay/root/functions.sh

    r6569d2b r1a4b7a1  
    9292  " >> /etc/X11/xorg.conf 
    9393 
     94  echo "Hybrid video detected! Using Intel chipset..." 
     95  sleep 3 
     96 
    9497  return 0 
    95  
    9698} 
    9799 
  • src-qt4/pc-xgui/resources/bin/rundetect.sh

    r6569d2b r1a4b7a1  
    8383EndSection 
    8484  " >> /etc/X11/xorg.conf 
     85 
     86  echo "Hybrid video detected! Using Intel chipset..." 
     87  sleep 3 
    8588 
    8689  return 0 
  • src-sh/pc-extractoverlay/desktop-overlay/boot/loader.conf.pcbsd

    rca5b4b5 r8649169  
    2626kern.cam.scsi_delay="500" 
    2727 
    28 # Placeholder for future ZFS TRIM support in 9.2/10 
    29 # vfs.zfs.trim_disable=0 
    30  
    3128# Load Linux compat 
    3229linux_load="YES" 
  • src-sh/pc-extractoverlay/server-overlay/boot/loader.conf.trueos

    r33bde6a r8649169  
    1 # Placeholder for future ZFS TRIM support in 9.2/10 
    2 # vfs.zfs.trim_disable=0 
    31zfs_load="YES" 
    42opensolaris_load="YES" 
    5  
  • src-qt4/pc-pfmanager/mainwindow.ui

    r1620346 rbe85a4e  
    4242       </item> 
    4343       <item row="2" column="0"> 
    44         <widget class="QGroupBox" name="groupBox"> 
     44        <widget class="QGroupBox" name="groupBox_1"> 
    4545         <property name="title"> 
    4646          <string>Configuration</string> 
    4747         </property> 
    48          <layout class="QGridLayout" name="gridLayout"> 
     48         <layout class="QGridLayout" name="gridLayout_1"> 
    4949          <item row="0" column="1"> 
    5050           <widget class="QPushButton" name="pbRestore"> 
     
    153153      </layout> 
    154154     </widget> 
    155      <widget class="QWidget" name="tab"> 
     155     <widget class="QWidget" name="tab_2"> 
    156156      <attribute name="title"> 
    157157       <string>Exceptions</string> 
  • src-qt4/pc-pfmanager/pfaddlg.cpp

    r1620346 rbe85a4e  
    2626    rbAllow->setChecked(true); 
    2727     
     28    //First define the "Custom" service 
     29    cbServices->addItem("Custom"); 
    2830    // Add all services 
    2931    for ( services::items_cit it = services::getInstance()->items().begin();  
Note: See TracChangeset for help on using the changeset viewer.