Still trying to get local changes into cocos2d...
Still trying to get local changes into cocos2d...
CCBReader submodule is now the SingleDigitLabs fork
Merge branch 'develop-v2' of github.com:singledigitlabs/cocos2d-iphone into develop-v2
Forcing changes to be recognized (again), part 1/2
Forcing changes to be recognized (again), part 2/2
Still trying to get changes to CCBReader picked up…
CCBReader is now on the master branch; for some reason it was on a non-existing HEAD branch...
Added new init method to CCTexture2D that doesn't take dimensions, so that CCLabelTTF can create auto-sized labels that specify alignment (otherwise multi-line labels will always have the default alignment, which isn't desired). CocosBuilder already behaves in this way.
- Fixed bug in cross-fade where the transitioning-out scene would be "double faded" (i.e. darkened)
Changed build settings
Merge branch 'develop-v2' of https://github.com/singledigitlabs/cocos2d-iphone into develop-v2

Conflicts:
	.gitmodules
	cocos2d-ios.xcodeproj/project.pbxproj
	external/CCBReader