Merge pull request #174 from ailin-nemui/entry-prompt-colours

author ailin-nemui <redacted>

Wed, 9 Dec 2015 11:01:00 +0000 (12:01 +0100)

committer ailin-nemui <redacted>

Wed, 9 Dec 2015 11:01:00 +0000 (12:01 +0100)
author ailin-nemui <redacted>
Wed, 9 Dec 2015 11:01:00 +0000 (12:01 +0100)
committer ailin-nemui <redacted>
Wed, 9 Dec 2015 11:01:00 +0000 (12:01 +0100)
diff --cc src/fe-text/gui-entry.c
Simple merge
diff --cc src/fe-text/gui-printtext.c
Simple merge
author	ailin-nemui <redacted>
	Wed, 9 Dec 2015 11:01:00 +0000 (12:01 +0100)
committer	ailin-nemui <redacted>
	Wed, 9 Dec 2015 11:01:00 +0000 (12:01 +0100)
		1	2
src/fe-text/gui-entry.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/fe-text/gui-printtext.c	patch \|	diff1 \|	diff2 \|	blob \| history