Andrey Vlasovskikh 4f42d4dc4f Merge branch 'vlasovskikh/surround' ... # Conflicts: # CHANGES.md # resources/META-INF/plugin.xml # src/com/maddyhome/idea/vim/option/Options.java		2016-02-04 23:08:37 +03:00
..
META-INF	Merge branch 'vlasovskikh/surround'	2016-02-04 23:08:37 +03:00
messages.properties	Added the 'g@' command for IdeaVim extensions	2016-01-26 01:02:20 +03:00