Merge branch 'vendor/LIBEDIT'
authorJohn Marino <draco@marino.st>
Sat, 11 May 2013 19:34:39 +0000 (21:34 +0200)
committerJohn Marino <draco@marino.st>
Sat, 11 May 2013 19:34:39 +0000 (21:34 +0200)
commit594c4953027a5ecfd13624ff56bf1a61d8898663
tree151169f146b675ca8e07c99eb9c8640c22ce5fc0
parent441874dbae788741793b27103c60211313e40a5e
parentc8e4d2bf99bf261bf06d007dc79e22df79b4381e
Merge branch 'vendor/LIBEDIT'

Conflicts:
contrib/libedit/src/editline/readline.h
contrib/libedit/src/readline.c
contrib/libedit/src/el.c
contrib/libedit/src/sys.h