]> git.ipfire.org Git - thirdparty/prompt.git/commitdiff
projects / thirdparty / prompt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8738e8b c37073f)
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)
Conflicts:
font/Prompt-BlackItalic.otf
font/Prompt-BlackItalic.ttf


Trivial merge
Mirror of https://github.com/cadsondemak/prompt.git