]> code.bitgloo.com Git - clyne/entityx.git/commitdiff
projects / clyne / entityx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a2f8fb 9eddc27)
Merge pull request #1 from alecthomas/master
authorAntony <acron1@gmail.com>
Wed, 30 Oct 2013 08:30:12 +0000 (01:30 -0700)
committerAntony <acron1@gmail.com>
Wed, 30 Oct 2013 08:30:12 +0000 (01:30 -0700)
Merge changes from upstream


Trivial merge
EntityX - A fast, type-safe C++ Entity-Component system