]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/6.8'
authorArtur Signell <artur@vaadin.com>
Tue, 31 Jan 2012 16:55:40 +0000 (18:55 +0200)
committerArtur Signell <artur@vaadin.com>
Tue, 31 Jan 2012 16:55:40 +0000 (18:55 +0200)
commit92fe7ca57723007184a6f48a8e3109fc48a4ff61
treef00f50d7bdbf99fca9b5ab13cc1f399c7cbd8968
parent94a7e95d37925e8784fc00d4b4f800f6bf7c1ee8
parentfbd4d8617b759ba7c35992c09a43a220ac151d29
Merge remote-tracking branch 'origin/6.8'

Conflicts:
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
src/com/vaadin/ui/Window.java