]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/6.8'
authorArtur Signell <artur@vaadin.com>
Fri, 27 Jan 2012 12:17:08 +0000 (14:17 +0200)
committerArtur Signell <artur@vaadin.com>
Fri, 27 Jan 2012 12:17:08 +0000 (14:17 +0200)
commit8cc1ee0aa018012e6644723860a353d41d6af7f8
tree65ce329c2b82a498be734cb94b5c0f7caaa33379
parent08aef8e80937b3c81d8a6761827f72b65c25e71c
parent9d8b8ee4376b14ca91c9fbc20506f88943116807
Merge remote-tracking branch 'origin/6.8'

Conflicts:
WebContent/VAADIN/themes/base/table/table.css
WebContent/release-notes.html
build/build.xml
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/VSlider.java
src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/ui/Table.java
tests/integration_tests.xml
tests/test.xml
tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
29 files changed:
WebContent/VAADIN/themes/base/datefield/datefield.css
WebContent/VAADIN/themes/base/table/table.css
WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
WebContent/VAADIN/themes/base/window/window.css
WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
build/build.properties
build/build.xml
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/VDebugConsole.java
src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/VSlider.java
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
src/com/vaadin/terminal/gwt/client/ui/VView.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/ui/Component.java
src/com/vaadin/ui/Table.java
tests/integration_tests.xml
tests/server-side/com/vaadin/tests/VaadinClasses.java
tests/test.xml
tests/testbench/com/vaadin/tests/Components.java
tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java
tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java