Merge remote-tracking branch 'mathewv/master' into oneshot-fop

This commit is contained in:
Vinyl Darkscratch 2017-05-14 15:53:25 -07:00
commit 4965867df9

1
.gitignore vendored
View file

@ -24,6 +24,7 @@ object_script.*
rpgscript.bat
rpgscript - mklang.bat
oneshot_JA_2_merge.pot
oneshot_JA_2_merge-jpn.pot
xScripts.rxdata
.qmake.stash