Code

Open master#21

Code

Open

yejuntian wants to merge 10 commits intomastergree/pure2d:masterfrom open-mastergree/pure2d:open-masterCopy head branch name to clipboard

+34-36

Commits

Commits on Feb 6, 2014

• Added font 'size' support for pure2d layout.

  poiuy1984

  committed
  25c5c50

Commits on Jul 13, 2014

• Merge pull request #1 from longngo78/master

  Show description for b665832
  longngo

  committed
  b665832

Commits on Aug 25, 2014

• Merge pull request #2 from longngo78/open-master

  Show description for c20578b
  longngo

  committed
  c20578b

Commits on Sep 17, 2014

• Minor bug fixes. Update target SDK to 19.

  

  Sheng Liu

  committed
  2acb442

Commits on Sep 18, 2014

• Merge pull request #40 from sheng-liu/master

  Show description for de7203e
  

  Long Ngo

  committed
  de7203e

• Merge pull request #36 from andy-yao/andy-layout

  Show description for 120e71f
  

  Long Ngo

  committed
  120e71f

Commits on Sep 19, 2014

• removed unused variables

  

  Long Ngo

  committed
  267307b

• Merge pull request #41 from long-ngo/master

  Show description for 1a01e48
  

  Long Ngo

  committed
  1a01e48

• Merge branch 'master' of https://git.gree-dev.net/android/pure2d into open-master

  

  Long Ngo

  committed
  70cad34

• Merge branch 'open-master' of https://github.com/gree/pure2d into open-master

  

  Long Ngo

  committed
  a1e0863