Permalink
Commits on Dec 21, 2012
  1. Merge pull request #1774 from minggo/iss1603-adjust-directory

    issue #1603:modify some path for auto building
    minggo committed Dec 21, 2012
  2. Merge pull request #1773 from minggo/iss1603-adjust-directory

    issue #1603:modify path of cocos2d-x
    minggo committed Dec 21, 2012
  3. Merge pull request #1772 from minggo/iss1603-adjust-directory

    issue #1603:change pathes of android codes
    minggo committed Dec 21, 2012
  4. Merge pull request #1771 from minggo/iss1603-adjust-directory

    issue #1603: modify some pathes
    minggo committed Dec 21, 2012
  5. issue #1603: modify some pathes

    minggo committed Dec 21, 2012
  6. Merge pull request #1770 from minggo/iss1603-adjust-directory

    issue #1536:add permissions and modify module path error
    minggo committed Dec 21, 2012
  7. Merge pull request #1769 from minggo/iss1603-adjust-directory

    issue #1603:modify pathes for auto test
    minggo committed Dec 21, 2012
  8. Merge pull request #1768 from minggo/iss1603-adjust-directory

    Iss1603 adjust directory
    minggo committed Dec 21, 2012
  9. Merge pull request #4 from dumganhar/iss1603-adjust-directory

    issue #1603: Updated TestLua project setting for iOS port.
    minggo committed Dec 21, 2012
Commits on Dec 20, 2012
  1. Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/…

    …cocos2d-x into iss1603-adjust-directory
    dumganhar committed Dec 20, 2012
  2. issue #1603:build ok on mac

    minggo committed Dec 20, 2012
  3. issue #1603:adjust samples directory

    Signed-off-by: minggo <ming@cocos2d-x.org>
    minggo committed Dec 20, 2012
  4. Updated android build files.

    dumganhar committed Dec 20, 2012
  5. Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into is…

    …s1603-refactor-folder
    
    Conflicts:
    	samples/Javascript/Shared
    dumganhar committed Dec 20, 2012
  6. Merge pull request #1764 from dumganhar/iss1617-js-improvements

    fixed #1617: Some improvements for JS Bindings.
    dumganhar committed Dec 20, 2012