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

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

projects / vaadin-framework.git / commit

author	Leif Åstrand <leif@vaadin.com>
	Fri, 3 Aug 2012 11:24:33 +0000 (14:24 +0300)
committer	Leif Åstrand <leif@vaadin.com>
	Fri, 3 Aug 2012 11:24:33 +0000 (14:24 +0300)
commit	94f81dc79526a257451c6638a0696e7505227cb7
tree	13f094b896c74032ab86d079362a511f8ce478a1	tree \| snapshot
parent	406c50ad6cbe537ce709b8958272f93c919e9653	commit \| diff
parent	bc5831f069f648fbf0d89a863b28d80dc4c2bf35	commit \| diff

Merge remote-tracking branch 'origin/6.8'

+ add @Override

Conflicts:
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java
src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/ui/LoginForm.java
src/com/vaadin/ui/Table.java
tests/test.xml

16 files changed:

src/com/vaadin/Application.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/Util.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/VOverlay.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java	diff1 \|	\|	blob \| history
src/com/vaadin/ui/LoginForm.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/Root.java	diff1 \|	\|	blob \| history
src/com/vaadin/ui/Table.java	diff1 \|	diff2 \|	blob \| history
tests/test.xml	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java	\|	diff2 \|	blob \| history

Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework

RSS Atom

src/com/vaadin/Application.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/Util.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/VOverlay.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java	diff1 \|	\|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java	diff1 \|	\|	blob \| history
src/com/vaadin/ui/LoginForm.java	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/ui/Root.java	diff1 \|	\|	blob \| history
src/com/vaadin/ui/Table.java	diff1 \|	diff2 \|	blob \| history
tests/test.xml	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java	\|	diff2 \|	blob \| history