From: Daniel Imms <daimms@microsoft.com>
Date: Tue, 6 Jun 2017 21:34:07 +0000 (-0700)
Subject: Merge remote-tracking branch 'ups/master' into set_row_height_explicitly
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=46f6fd18b02605da6ae3f613ba427054f6298947;p=mirror_xterm.js.git

Merge remote-tracking branch 'ups/master' into set_row_height_explicitly
---

46f6fd18b02605da6ae3f613ba427054f6298947