Merge branch 'master' of github.com:jeena/Tentia into linux

This commit is contained in:
Jeena Paradies 2012-11-10 11:46:47 +01:00
commit d3e988fe2e
171 changed files with 14997 additions and 944 deletions

4
.gitignore vendored
View file

@ -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