kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-04-08 09:47:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Laurent Sansonetti
2013-06-14 13:52:02 +02:00
parent 5803cf3c2c 01c5f6e06c
commit 2bc5401781
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -7,6 +7,8 @@
* [iOS] Fixed a bug where `rake simulator' would open 2 simulator apps at
the same time, due to the fact that the application name changed between
Xcode 4.x and Xcode 5.
* Improve string interpolation performance. 40% faster.
* Improve String#delete performance. 5 times faster.
= RubyMotion 2.2 =

2
Rakefile
View File

@@ -1,4 +1,4 @@
PROJECT_VERSION = '2.2'
PROJECT_VERSION = '2.3'
PLATFORMS_DIR = (ENV['PLATFORMS_DIR'] || '/Applications/Xcode.app/Contents/Developer/Platforms')
sim_sdks = Dir.glob(File.join(PLATFORMS_DIR, 'iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator*.sdk')).map do |path|

2
vm

Submodule vm updated: 0ff3a560ad...19cafc5d44