Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/egret-labs/egret-core
Browse files Browse the repository at this point in the history
  • Loading branch information
WanderWang committed Aug 13, 2016
2 parents 31ec8d5 + 4b8c5c4 commit 9577676
Show file tree
Hide file tree
Showing 42 changed files with 22,328 additions and 21,227 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Egret Engine
================================================
Current Version: v3.1.5
Current Version: v3.1.6


Developed by Egret Technology, Egret Engine 3.0 includes a newly built 3D engine and a 2D engine created based on HTML5. With its robust cross-platform operability and commitment to solving the performance and fragmentation problems of HTML5 APP and games, Egret Engine 3.0 will perfectly meet developers’ needs. We appreciate every suggestion and please send it to Egret team if you have any.
Expand Down Expand Up @@ -39,6 +39,8 @@ Document & API

Release Notes
--------------------
[Egret 3.1.6 Release Notes 2016-8-8](/docs/en/3.1.6_ReleaseNotes.md)

[Egret 3.1.5 Release Notes 2016-7-25](/docs/en/3.1.5_ReleaseNotes.md)

[Egret 3.1.4 Release Notes 2016-7-11](/docs/en/3.1.4_ReleaseNotes.md)
Expand Down Expand Up @@ -151,6 +153,8 @@ Egret Engine 3.0 包含了白鹭时代研发的遵循HTML5标准的2D引擎及

发布说明
--------------------
[Egret 3.1.6 Release Notes 2016-8-8](/docs/cn/3.1.6_ReleaseNotes.md)

[Egret 3.1.5 Release Notes 2016-7-25](/docs/cn/3.1.5_ReleaseNotes.md)

[Egret 3.1.4 Release Notes 2016-7-11](/docs/cn/3.1.4_ReleaseNotes.md)
Expand Down
Loading

0 comments on commit 9577676

Please sign in to comment.