Merge branch 'master' into ios-unified-ts-fix
authorIvan Maidanski <ivmai@mail.ru>
Sat, 28 Feb 2015 20:01:14 +0000 (23:01 +0300)
committerIvan Maidanski <ivmai@mail.ru>
Sat, 7 Mar 2015 13:18:03 +0000 (16:18 +0300)
commitb51a05f39899bddbe97bb6a7ad86d15d6d0289d8
treee2254b704cf093b993da5808ca0b630f02d64417
parent1741274f2a746d4ed9d3c2eb0463c7caefe7e3f9
parent5e756d4d8df2949cb3b6e51532d3016cbb276fd7
Merge branch 'master' into ios-unified-ts-fix

Conflicts:
include/private/gc_priv.h
darwin_stop_world.c
include/private/gc_priv.h
os_dep.c