Merge branch 'vendor/LIBEDIT'
authorJohn Marino <draco@marino.st>
Tue, 3 Nov 2015 23:58:27 +0000 (00:58 +0100)
committerJohn Marino <draco@marino.st>
Tue, 3 Nov 2015 23:58:27 +0000 (00:58 +0100)
commit5fd565a09d464d3d0042df9997c41e8f1995a5b5
treed3adf5b721d3eb818ac43924c57f87c2070fdd45
parent06dd69fa79bd989a09f43eba622a60379e3a37fa
parenta0c9eb18debe82e3cbe370d5e1a639a09cbac2e9
Merge branch 'vendor/LIBEDIT'

Conflicts:
contrib/libedit/src/chartype.h
contrib/libedit/src/eln.c
contrib/libedit/src/chartype.h
contrib/libedit/src/eln.c
contrib/libedit/src/filecomplete.c