]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into valo
authorJouni Koivuviita <jouni@vaadin.com>
Tue, 3 Jun 2014 09:58:56 +0000 (12:58 +0300)
committerJouni Koivuviita <jouni@vaadin.com>
Tue, 3 Jun 2014 12:09:11 +0000 (15:09 +0300)
commitad452a36795b764aeea2b00e3ceed2bae75d7949
tree9b522f8b93464520430d839ab1608fa372efe23a
parente65231e6028892bd6847777c5bad982b73278b14
parent44eadeaa160152616152cd33f8181d7ab1fa3359
Merge branch 'master' into valo

Conflicts:
WebContent/release-notes.html
build.properties
client/src/com/vaadin/client/ApplicationConfiguration.java

Change-Id: I36f075a03350e45c8666832142d7368891af3e59
WebContent/release-notes.html
build.properties
client/src/com/vaadin/client/ApplicationConfiguration.java
client/src/com/vaadin/client/debug/internal/theme/DebugWindowStyles.java
client/src/com/vaadin/client/ui/VOverlay.java