source.dussan.org Git - vaadin-framework.git/commit

Merge branch '6.8'

Conflicts:
WebContent/VAADIN/themes/base/common/common.scss
server/src/com/vaadin/server/VaadinServlet.java
server/src/com/vaadin/ui/AbstractField.java
src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java
tests/testbench/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
tests/testbench/com/vaadin/tests/components/table/TableReduceContainerSize.java
tests/testbench/com/vaadin/tests/tickets/Ticket8291.java
uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html
uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
uitest/src/com/vaadin/tests/tickets/Ticket8291.java
uitest/test.xml

author	John Ahlroos <john@vaadin.com>
	Mon, 10 Sep 2012 09:32:24 +0000 (12:32 +0300)
committer	John Ahlroos <john@vaadin.com>
	Mon, 10 Sep 2012 09:32:24 +0000 (12:32 +0300)
commit	00f75c5a162e58e04d6d6f087ccceab98dfdf1f0
tree	6b72d611dbd61ae48975ebb5c4b03da4435fb1fe	tree \| snapshot
parent	9015ff64aa0a5503e29aa57b0d66e0aa6892e315	commit \| diff
parent	b4e243c87d4b4f28fa18affecb855b8731682a59	commit \| diff

WebContent/VAADIN/themes/base/common/common.scss	diff1 \|	\|	blob \| history
client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java	diff1 \|	\|	blob \| history
client/src/com/vaadin/client/BrowserInfo.java	diff1 \|	\|	blob \| history
client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java	diff1 \|	\|	blob \| history
server/src/com/vaadin/ui/AbstractField.java	diff1 \|	\|	blob \| history
uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.html	\|	\|	blob
uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java	\|	\|	blob
uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.html	\|	\|	blob
uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java	\|	\|	blob