diff options
| author | Artur Signell <artur@vaadin.com> | 2012-01-27 14:17:08 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-01-27 14:17:08 +0200 |
| commit | 8cc1ee0aa018012e6644723860a353d41d6af7f8 (patch) | |
| tree | 65ce329c2b82a498be734cb94b5c0f7caaa33379 /.gitignore | |
| parent | 08aef8e80937b3c81d8a6761827f72b65c25e71c (diff) | |
| parent | 9d8b8ee4376b14ca91c9fbc20506f88943116807 (diff) | |
| download | vaadin-framework-8cc1ee0aa018012e6644723860a353d41d6af7f8.tar.gz vaadin-framework-8cc1ee0aa018012e6644723860a353d41d6af7f8.zip | |
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
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions