[EGIT] [apps/terminology] master 02/02: Merge branch 'terminology-1.1'

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=461848813b48fb3daf7b810dc771f6c47d707b6d

commit 461848813b48fb3daf7b810dc771f6c47d707b6d
Merge: 50c1441 2343efd
Author: Boris Faure <bill...@gmail.com>
Date:   Mon Aug 21 23:33:40 2017 +0200

    Merge branch 'terminology-1.1'

 src/bin/termptyesc.c | 6 +++---
 src/bin/termptyops.c | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

--