Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

closed #4163: add cceditbox to winrt #5805

Merged
merged 4 commits into from
Apr 10, 2014

Conversation

squirrelChen
Copy link
Contributor

@stammen @dumganhar
please review it.

@stammen
Copy link
Contributor

stammen commented Mar 14, 2014

Sorry I have not got to this review yet. I am close to finishing cocos2d-x 3.0 for wp8-xaml. I will review this early next week.

Thanks,

Dale

From: Jingchen [mailto:notifications@github.com]
Sent: Friday, March 14, 2014 5:55 AM
To: cocos2d/cocos2d-x
Cc: Dale Stammen (MS OPEN TECH)
Subject: [cocos2d-x] closed #4163: add cceditbox to winrt (#5805)

@stammenhttps://github.com/stammen @dumganharhttps://github.com/dumganhar
please review it.


You can merge this Pull Request by running

git pull https://github.com/koowolf/cocos2d-x CCEditBox_winrt

Or view, comment on, or merge it at:

#5805

Commit Summary

File Changes

Patch Links:


Reply to this email directly or view it on GitHubhttps://github.com//pull/5805.

@squirrelChen
Copy link
Contributor Author

@stammen no problem,Take your time -- there is no rush.

@dumganhar
Copy link

This Pr could not be automatically merged.

…EditBox_winrt

Conflicts:
	extensions/proj.winrt/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/proj.winrt/TestCpp.vcxproj.filters
@squirrelChen
Copy link
Contributor Author

can auto merged now.

@JoelOliv
Copy link

JoelOliv commented Apr 4, 2014

anyone have any idea when you will do the merge

@toryxu
Copy link

toryxu commented Apr 8, 2014

@stammen can you please help review? then we can start to merge it. Thanks.

@stammen
Copy link
Contributor

stammen commented Apr 9, 2014

Good job on the code! The code builds and runs in the cocos2d-winrt.vc2012.sln project but not the cocos2d-winrt.vc2013.sln winrt project. Please fix and test the VS2013 project by adding the missing files. Also, please verify that ARM versions build correctly.

dumganhar pushed a commit that referenced this pull request Apr 10, 2014
@dumganhar dumganhar merged commit 2e16978 into cocos2d:master Apr 10, 2014
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 30, 2014
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 30, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants