diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-05-17 15:14:15 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-05-17 15:14:59 +0300 |
| commit | 1205e87be7f306e6c307190ae6423ee64f1c7b17 (patch) | |
| tree | 670858e0940b45b0b42fdb7d30bb2f07e356c443 /theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml | |
| parent | a52ceb96590333bbfcb7ddad4815c88c49ac97ab (diff) | |
| parent | 9b6b735752e2f30bcdf6a521e031a8de22343bb0 (diff) | |
| download | vaadin-framework-1205e87be7f306e6c307190ae6423ee64f1c7b17.tar.gz vaadin-framework-1205e87be7f306e6c307190ae6423ee64f1c7b17.zip | |
Merge commit 'a52ceb96590333' into 7.1
Conflicts:
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
Change-Id: I049a08a5d129b8072bf91554ca0eab0d44e537e3
Diffstat (limited to 'theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml')
| -rw-r--r-- | theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml b/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml index f921bec167..29dc2d3474 100644 --- a/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml +++ b/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml @@ -31,7 +31,7 @@ <dependency org="com.google.collections" name="google-collections" rev="0.9" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> <dependency org="args4j" name="args4j" rev="2.0.9" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> <dependency org="commons-math" name="commons-math" rev="1.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> - <dependency org="commons-io" name="commons-io" rev="1.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> + <dependency org="commons-io" name="commons-io" rev="2.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> <dependency org="commons-lang" name="commons-lang" rev="2.6" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> <dependency org="junit" name="junit" rev="4.4" force="true" conf="test->runtime(*),master(*)"/> </dependencies> |