Merge remote-tracking branch 'ups/v3' into 847_proper_scrollback_value

2017-08-08 19:05:24 -07:00
parent e7ee3ec63c 91bf3197ae
commit 996eb1b06f
180 changed files with 1297 additions and 1248 deletions
@@ -6,7 +6,7 @@ import { assert } from 'chai';
 import { ITerminal } from './Interfaces';
 import { Buffer } from './Buffer';
 import { CircularList } from './utils/CircularList';
-import { MockTerminal } from './utils/TestUtils';
+import { MockTerminal } from './utils/TestUtils.test';

 const INIT_COLS = 80;
 const INIT_ROWS = 24;