Merge master

This commit is contained in:
Aditya Kulkarni
2019-02-04 13:42:51 -08:00
9 changed files with 14 additions and 9 deletions

1
.gitignore vendored
View File

@@ -4,6 +4,7 @@ release/
x64/
artifacts/
.vscode/
res/libsodium.a
res/libsodium/libsodium*
res/libsodium.a
src/ui_*.h