Merge pull request #8340 from electron/options-cycle
authorKevin Sawicki <kevin@github.com>
Mon, 9 Jan 2017 16:29:56 +0000 (08:29 -0800)
committerGitHub <noreply@github.com>
Mon, 9 Jan 2017 16:29:56 +0000 (08:29 -0800)
commit52390120ae8e70387f3bc6340090dc9d8b369cc8
treea1d0c0cc148c3dfc008cece22420fc05aa064114
parent0a7dccbad8ecc649c3a17bece4f7ba12557f901a
parent1f07977f091ef9b23e75d333ac141a78364884d9
Merge pull request #8340 from electron/options-cycle

Handle cycles when merging browser window options