[prev in list] [next in list] [prev in thread] [next in thread] 

List:       dragonfly-commits
Subject:    git: Merge remote-tracking branch 'origin/vendor/LIBEDIT'
From:       Rimvydas Jasinskas <zrj () crater ! dragonflybsd ! org>
Date:       2019-04-30 17:57:40
Message-ID: 20190430175740.5C3A06606E6 () crater ! dragonflybsd ! org
[Download RAW message or body]


commit 30baa437bb9bd1152f19689c2d0442f652174e87
Merge: 02aa41ec25 12db70c866
Author: zrj <zrj@dragonflybsd.org>
Date:   Tue Apr 30 20:59:56 2019 +0300

    Merge remote-tracking branch 'origin/vendor/LIBEDIT'
    
     Conflicts:
    	contrib/libedit/src/chartype.h
    	contrib/libedit/src/eln.c
    	contrib/libedit/src/filecomplete.c
    	contrib/libedit/src/sys.h

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/30baa437bb9bd1152f19689c2d0442f652174e87


-- 
DragonFly BSD source repository
[prev in list] [next in list] [prev in thread] [next in thread]