]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/6.8'
authorArtur Signell <artur@vaadin.com>
Fri, 23 Mar 2012 07:52:33 +0000 (09:52 +0200)
committerArtur Signell <artur@vaadin.com>
Fri, 23 Mar 2012 07:52:33 +0000 (09:52 +0200)
commitb052e30bb6aad20a4a7f840ff4fa646c2967e290
treef11e9108119ec519810cf27c112fd855a5095148
parentdd06b3cb695567379b381e4be28fb609d0c70074
parent2296d93d648857c248162a1261a15e7a8c7ca378
Merge remote-tracking branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java
src/com/vaadin/terminal/gwt/client/ui/EmbeddedConnector.java
src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
src/com/vaadin/ui/Button.java
src/com/vaadin/ui/Embedded.java
tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java