]> source.dussan.org Git - vaadin-framework.git/commit
Merged 'b1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67' (origin/6.8)
authorArtur Signell <artur@vaadin.com>
Tue, 31 Jan 2012 13:33:01 +0000 (15:33 +0200)
committerArtur Signell <artur@vaadin.com>
Tue, 31 Jan 2012 13:33:01 +0000 (15:33 +0200)
commitc1f26940cd893dc5e89d2c6eb39d83ce668557fe
treecbe03a6cba732d0bcb1ddce2ece938dd07165489
parent1d01f9204bd760789592238be039acef57616109
parentb1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67
Merged 'b1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67' (origin/6.8)

Conflicts:
WebContent/release-notes.html
tests/server-side/com/vaadin/tests/server/LicenseInJavaFiles.java
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/ui/Window.java
tests/integration_tests.xml
tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java