Merge branch 'Unity-Technologies-upstreaming/emscripten'
authorIvan Maidanski <ivmai@mail.ru>
Sun, 13 Jul 2014 08:40:52 +0000 (12:40 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Sun, 13 Jul 2014 08:40:52 +0000 (12:40 +0400)
commitf6f4d1563b27af7e05ffe9ed676aff448b38c40e
tree47545a943c42c27722384a0289147bc357658266
parent6c5a455c722172f0defcfb77aa28b2709a191e7c
parent0de8dc7b7fa1c5aa872349843b5646c55a849c75
Merge branch 'Unity-Technologies-upstreaming/emscripten'