Merge branch 'master' into android_studio

Conflicts: update_dependencies.xml
Fix unresolved conflicts in update_dependencies.xml.
2026-03-11 00:21:31 +00:00 · 2014-02-17 11:25:04 +04:00 · 2013-12-21 18:16:38 +04:00 · 2013-12-19 23:46:41 +04:00 · 2013-12-09 15:08:58 +04:00
1 changed files with 1 additions and 1 deletions
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
  <version>@snapshot@</version>
  <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>

-  <idea-version since-build="133.0" until-build="134.0"/>
+  <idea-version since-build="132.1045" until-build="132.1071"/>

  <depends optional="true" config-file="junit.xml">JUnit</depends>
  <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
Author	SHA1	Message	Date
Natalia Ukhorskaya	ef3add1005	Merge branch 'master' into android_studio Conflicts: update_dependencies.xml	2014-02-17 11:25:04 +04:00
Zalim Bashorov	a2a6d987a4	Fix unresolved conflicts in update_dependencies.xml.	2013-12-21 18:16:38 +04:00
Zalim Bashorov	60694b2627	Merge master into android_studio	2013-12-19 23:46:41 +04:00
Nikolay Krasko	3f785bdc31	Downgrade to idea 132.1045 to be compatible with Android Studio 0.3.7	2013-12-09 15:08:58 +04:00