Skip to content

Commit 66c36e5

Browse files
committed
Merging in development.
1 parent ec9a747 commit 66c36e5

File tree

238 files changed

+8554
-3589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+8554
-3589
lines changed

.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,4 @@ monocle.creator.*
3838
*.perspective
3939
*.perspectivev3
4040
*.pbxuser
41-
/Project/Xcode4/MonocleTest/MonocleTest.xcodeproj/project.xcworkspace/xcuserdata/
42-
/Project/Xcode4/MonocleTest/MonocleTest.xcodeproj/xcuserdata/
41+
*.xcuserstate

Code/Asset.h

-50
This file was deleted.

Code/Assets.h

-50
This file was deleted.

Code/Audio/Audio.cpp

-183
This file was deleted.

Code/Audio/AudioDecoder.cpp

-39
This file was deleted.

0 commit comments

Comments
 (0)