Ignore:
Timestamp:
10/18/13 08:26:49 (17 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
4fb8829, c69425e
Parents:
71c5890 (diff), 8a6f762 (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

Conflicts:

build-files/conf/port-make.conf

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/port-make.conf

    r71c5890 r04421bd  
    5959# OptionsNG 
    6060gpgme_SET=GPGSM 
    61  
    62 # Enable GVIM and other options 
    63 WITH_VIM_OPTIONS=YES 
    6461 
    6562# OptionsNG 
     
    131128#Set some rxvt-unicode options 
    132129rxvt-unicode_SET= 256_COLOR 
     130 
     131# Enable GUI for VIM 
     132vim_SET=WITH_OPTIONS WITH_VIM_OPTIONS 
Note: See TracChangeset for help on using the changeset viewer.