Merge remote-tracking branch 'ups/master' into pr/1148

This commit is contained in:
Daniel Imms
2018-01-28 13:39:07 -08:00
45 changed files with 563 additions and 619 deletions
+2 -2
View File
@@ -3,8 +3,8 @@
* @license MIT
*/
import { IColorSet, IColorManager } from './Interfaces';
import { ITheme } from '../Interfaces';
import { IColorSet, IColorManager } from './Types';
import { ITheme } from 'xterm';
const DEFAULT_FOREGROUND = '#ffffff';
const DEFAULT_BACKGROUND = '#000000';