Merge branch 'master' into nodeDescriptor_names_ext
authorEgor.Ushakov <egor.ushakov@jetbrains.com>
Mon, 24 Aug 2015 08:03:42 +0000 (11:03 +0300)
committerEgor.Ushakov <egor.ushakov@jetbrains.com>
Mon, 24 Aug 2015 08:03:42 +0000 (11:03 +0300)
commitbcf34170a454ae9870cdbbb8b88e73a4ea9773a4
tree5bdc017125cd5afbe7ac86e08ff8419d0b433fd6
parent501a5453ae0b702eda79010fecc07fb8ad0f383a
parentb95ea57798394b71e15bfcc9cf5dbb41ef68fab8
Merge branch 'master' into nodeDescriptor_names_ext
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/FieldDescriptorImpl.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/LocalVariableDescriptorImpl.java
resources/src/META-INF/IdeaPlugin.xml