Merge remote-tracking branch 'origin/new-winpty'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 20 Jun 2016 18:36:54 +0000 (20:36 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 20 Jun 2016 18:36:54 +0000 (20:36 +0200)
1  2 
build/scripts/libLicenses.gant
lib/required_for_dist.txt

Simple merge
Simple merge