Changeset 1b6f8e8


Ignore:
Timestamp:
04/29/14 06:44:11 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
dd2a5b57, 01d574a
Parents:
77ee7b2 (diff), 879ce1d (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:
4 added
3 edited

Legend:

Unmodified
Added
Removed
  • lumina/port-files/Makefile

    r2e6ba6c r879ce1d  
    33 
    44PORTNAME=       lumina 
    5 PORTVERSION=    0.1-CHGVERSION 
    6 PORTEPOCH=      1 
     5PORTVERSION=    CHGVERSION 
    76CATEGORIES=     x11 
    87MASTER_SITES=   http://www.pcbsd.org/~kris/software/ \ 
  • pbi-modules/mknew.sh

    rfe38ed3 r592c374  
    3232  lic=`pkg rquery '%L' $1 | head -n 1` 
    3333  type="Text" 
    34    pkg rquery '%do' $1 | grep -q "x11" 
    35    if [ $? -eq 0 ] ; then 
    36       type="Graphical" 
    37    fi 
     34  pkg rquery '%do' $1 | grep -q "x11" 
     35  if [ $? -eq 0 ] ; then type="Graphical"; fi 
     36  echo "Enter the program search keywords - using , between" 
     37  echo -e ">\c" 
     38  read tags 
    3839else 
    3940 
  • lumina/lumina-desktop/LSession.cpp

    r51ace02 r77ee7b2  
    1414LSession::LSession(int &argc, char ** argv) : QApplication(argc, argv){ 
    1515  this->setApplicationName("Lumina Desktop Environment"); 
    16   this->setApplicationVersion("0.1"); 
     16  this->setApplicationVersion("0.2"); 
    1717  this->setOrganizationName("LuminaDesktopEnvironment"); 
    1818  this->setQuitOnLastWindowClosed(false); //since the LDesktop's are not necessarily "window"s 
Note: See TracChangeset for help on using the changeset viewer.