diff options
author | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-08-22 20:49:54 +0700 |
---|---|---|
committer | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-08-22 20:49:54 +0700 |
commit | 9d617a46ca8537433eeeaec2d57c30694d3407cd (patch) | |
tree | fd53aceec150b18c9c498a1b3f0a45b3cfe69409 /.gitignore | |
parent | 38f58c78c64fd7c7d555976306c2a9b6f5e6df5a (diff) | |
parent | 2679bcec2d5938125634d970f025518c42498628 (diff) |
Merge branch 'development' of ssh://darapsa.co.id/usr/local/git/kelakon into development
# Conflicts:
# kelakon.qrc
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ build-* *.pro.user +*.swp |