[Chinese-commits] [fqterm] 61/76: Merge branch 'master' into local_socket_test

[Boyuan Yang]

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository fqterm.

commit 833a96f230cd47e64987a97c88dbf7c132a931ac
Merge: 6f0369a cbb190c
Author: Iru Dog <mytbk920423 at gmail.com>
Date:   Thu Nov 6 23:44:14 2014 +0800

    Merge branch 'master' into local_socket_test
    
    Conflicts:
    	src/protocol/fqterm_local_socket.cpp
    	src/terminal/internal/fqterm_telnet.cpp

 src/common/fqterm_path.cpp              |  9 ++++++++-
 src/fqterm/main.cpp                     |  3 +--
 src/protocol/fqterm_local_socket.cpp    | 10 +++++++---
 src/protocol/fqterm_local_socket.h      |  5 +++--
 src/terminal/internal/fqterm_telnet.cpp |  2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git