From: Suppakit Chalermlarp <suppakit.cadsondemak@gmail.com>
Date: Fri, 20 Nov 2015 09:17:17 +0000 (+0700)
Subject: Merge branch 'master' of https://github.com/cadsondemak/prompt
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f924bc8ffc42c0d91c0fc9953a63fd6a2dd09455;p=thirdparty%2Fprompt.git

Merge branch 'master' of https://github.com/cadsondemak/prompt

Conflicts:
	font/Prompt-BlackItalic.otf
	font/Prompt-BlackItalic.ttf
---

f924bc8ffc42c0d91c0fc9953a63fd6a2dd09455