diff options
author | Erik Prabowo Kamal <erik@darapsa.co.id> | 2019-08-22 14:48:47 +0800 |
---|---|---|
committer | Erik Prabowo Kamal <erik@darapsa.co.id> | 2019-08-22 14:48:47 +0800 |
commit | 78037a9ee0c16eace9d7582e8f4b91725a552bbb (patch) | |
tree | 76062392b03926ea48c9e63904eccc4bd5928a04 | |
parent | fdca1a01d099c50d6e0f4982d633c0b2826bd6a1 (diff) | |
parent | 541a22d7b26fb775a37c00adf368e51decf316ef (diff) |
Merge branch 'master' into development
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ build-* *.pro.user +*.swp |