]> git.ipfire.org Git - thirdparty/prompt.git/commit
Merge branch 'master' of https://github.com/cadsondemak/prompt
authorSuppakit Chalermlarp <suppakit.cadsondemak@gmail.com>
Fri, 20 Nov 2015 09:17:17 +0000 (16:17 +0700)
committerSuppakit Chalermlarp <suppakit.cadsondemak@gmail.com>
Fri, 20 Nov 2015 09:17:17 +0000 (16:17 +0700)
commitf924bc8ffc42c0d91c0fc9953a63fd6a2dd09455
treed72756ec51a830702426f60ca03c71dcd8a5f7e3
parent8738e8b986b9738b8967bce70129ab2d3d84c3fa
parentc37073f7a603b3352bfc51bc892e64e7cdc038b2
Merge branch 'master' of https://github.com/cadsondemak/prompt

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