Merge branch 'master' of github.com:jeena/Tentia into linux
This commit is contained in:
commit
d3e988fe2e
171 changed files with 14997 additions and 944 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -1,4 +1,4 @@
|
|||
build/
|
||||
Tentia.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate
|
||||
Mac/build/
|
||||
Mac/Tentia.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate
|
||||
dsa_priv.pem
|
||||
*.pyc
|
||||
|
|
Reference in a new issue