Jeffrey Morgan d52810959a Fixing merges		2015-02-26 20:16:48 -05:00
..
VirtualBox_Uninstall.tool	Merge branch 'master' into machine	2015-02-26 16:18:26 -05:00
deps	Fixing merges	2015-02-26 20:16:48 -05:00
kitematic-beta.icns	Merge branch 'master' into machine	2015-02-26 16:18:26 -05:00
kitematic.icns	Merge branch 'master' into machine	2015-02-26 16:18:26 -05:00
preprocessor.js	Merge branch 'master' into machine	2015-02-26 16:18:26 -05:00
reset	Working version of machine	2015-02-26 20:14:43 -05:00
testenv.js	Merge branch 'master' into machine	2015-02-26 16:18:26 -05:00