Skip to content

Commit 8ca228d

Browse files
Merge pull request cocos2d#4 from dumganhar/spidermonkey_v22
Using SpiderMonkey v22 for js compiler Former-commit-id: f4c555cdb48bb8f522515e25a6290d728c830e32
2 parents 6572a45 + 4c53018 commit 8ca228d

Some content is hidden

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

63 files changed

+3682
-3138
lines changed

.gitignore

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,17 @@ nosetests.xml
3131
.project
3232
.pydevproject
3333

34-
#Xcode
35-
xcuserdata
34+
# Ignore files build by xcode
35+
*.mode*v*
36+
*.pbxuser
37+
*.xcbkptlist
38+
*.xcscheme
39+
*.xcworkspacedata
40+
*.xcuserstate
41+
xcschememanagement.plist
42+
build/
43+
.DS_Store
44+
._.*
45+
xcuserdata/
46+
DerivedData/
3647

console/bin/jsbcc.REMOVED.git-id

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
23fc1870d98cb6ce6b044c1e469e6224df622529
1+
460d6fcc07984b529be9e292d580b898ddc84b86

console/bin/jsbcc.exe

0 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3c0a242ed2a0449da7cc7dd4e80294708fd69343
1+
699c754b1966db02200950792d67465f403ac568

src/jsbcc_source/jsbcc-vc2010.suo

-8 KB
Binary file not shown.

src/jsbcc_source/jsbcc.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/jsbcc_source/jsbcc.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/jsbcc.xcscheme

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/jsbcc_source/jsbcc.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/jsbcc_source/jsbcc.xcodeproj/xcuserdata/rquesada.xcuserdatad/xcschemes/jsbcc.xcscheme

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/jsbcc_source/jsbcc.xcodeproj/xcuserdata/rquesada.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)