Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 11 Aug 2014 17:43:01 +0000 (21:43 +0400)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 11 Aug 2014 17:43:01 +0000 (21:43 +0400)
commit00bb70304608cf094b8cc117117e8d632270a813
tree305124544922521d0f5f0cce3bc40c449bc873c2
parent266b9e62ae8512bf541e27e8edc4c5d32058d5db
parent50f597b8f0fc7f533b09982cc0586ac23456b538
Merge remote-tracking branch 'origin/master'
platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java