Merge changes I2de7d14d,I56392340 into ub-games-master
authorWouter van Oortmerssen <wvo@google.com>
Mon, 4 May 2015 21:00:43 +0000 (21:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 May 2015 21:00:43 +0000 (21:00 +0000)
* changes:
  Added accessor for file_extension in generated code.
  Added missing --gen-mutable to CMakeLists.txt

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge