Merge remote-tracking branch 'origin/master' appcode/138.1919 clion/138.1914 dbe/138.1917 idea/138.1915 phpstorm/138.1916 pycharm/138.1922 rubymine/138.1918 webstorm/138.1920
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 28 Aug 2014 23:26:39 +0000 (01:26 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 28 Aug 2014 23:26:39 +0000 (01:26 +0200)
commitb773126386313b7c81586b2bc80b66c2b906caa5
tree1aa2ef52777f357d72c9026de96f0f247841e484
parent404990b8d1c2d1980aef817140e701f381d60374
parent70f8aa3a5e0434a2486a050489fc6f836310429e
Merge remote-tracking branch 'origin/master'
platform/platform-resources/src/idea/LangActions.xml