summaryrefslogtreecommitdiff
path: root/curvetun/Makefile
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-05-05 10:44:57 +0300
committerTobias Klauser <tklauser@distanz.ch>2015-05-05 11:55:29 +0200
commit0757f825dd4b0e3653a98264bbe3933d54b3c1ef (patch)
tree8b4bb216ab0460baa32b465808925123369ae854 /curvetun/Makefile
parentd245603ab331de51d774f3d69ba3689155b0eb53 (diff)
tprintf: Fix color breaking in less mode
Automatic new line indentation can break terminal ESC color sequence by inserting new line within it. Fixed by considering that color ESC sequence is not closed by 'm' and only after it is closed - print new line with spaces. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> [tk: add comments] Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'curvetun/Makefile')
0 files changed, 0 insertions, 0 deletions
=nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/bluetooth/rfcomm.h')