Merge remote-tracking branch 'origin/maintenance'

Conflicts:
	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation/src-gen/org/eclipse/xtext/example/homeautomation/validation/AbstractRuleEngineValidator.java
	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation/src/org/eclipse/xtext/example/homeautomation/GenerateRuleEngine.mwe2


Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
This commit is contained in:
Dennis Huebner 2016-01-28 10:06:59 +01:00
commit decbb8c947
2 changed files with 4 additions and 4 deletions

View file

@ -3,8 +3,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'org.xtext:xtext-gradle-plugin:1.0.1'
classpath 'org.xtext:xtext-idea-gradle-plugin:1.0.1'
classpath 'org.xtext:xtext-gradle-plugin:1.0.2'
classpath 'org.xtext:xtext-idea-gradle-plugin:1.0.2'
}
}

View file

@ -3,8 +3,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'org.xtext:xtext-gradle-plugin:1.0.1'
classpath 'org.xtext:xtext-idea-gradle-plugin:1.0.1'
classpath 'org.xtext:xtext-gradle-plugin:1.0.2'
classpath 'org.xtext:xtext-idea-gradle-plugin:1.0.2'
}
}