]> source.dussan.org Git - vaadin-framework.git/commit
projects / vaadin-framework.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9004b0d) | patch
Merge from 5.3 to 6.0:
authorHenri Sara <henri.sara@itmill.com>
Wed, 25 Mar 2009 07:33:58 +0000 (07:33 +0000)
committerHenri Sara <henri.sara@itmill.com>
Wed, 25 Mar 2009 07:33:58 +0000 (07:33 +0000)
commit2b04235d71fb31140f687e0ef80208b731fab1d8
tree01129a8ad558d843fbf1dad97c387ba32d25772dtree | snapshot
parent9004b0df409cc2fa4700d05eaa356f4ecc9efe7ecommit | diff
Merge from 5.3 to 6.0:
[7128] Fixes to merge tool.
[7129] Merge from branches/manual_2009_03 to versions/5.3 (multiple changesets)
[7131] Fixed language problems in the section on layout cell spacing.
[7132] Use 24 hour format instead of 12 hour for Eclipse Manual plugin timestamp.

svn changeset:7169/svn branch:6.0
13 files changed:
WebContent/index.html diff | blob | history
build/bin/mergetool.py diff | blob | history
build/build.xml diff | blob | history
src/com/itmill/toolkit/Application.java diff | blob | history
src/com/itmill/toolkit/data/util/PropertysetItem.java diff | blob | history
src/com/itmill/toolkit/demo/sampler/APIResource.java diff | blob | history
src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java diff | blob | history
src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java diff | blob | history
src/com/itmill/toolkit/tests/TestBench.java diff | blob | history
src/com/itmill/toolkit/tests/book/BookTestApplication.java diff | blob | history
src/com/itmill/toolkit/tests/book/DefaultButtonExample.java diff | blob | history
src/com/itmill/toolkit/ui/ProgressIndicator.java diff | blob | history
src/com/itmill/toolkit/ui/Slider.java diff | blob | history
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework