]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'layoutgraph'
authorLeif Åstrand <leif@vaadin.com>
Thu, 12 Apr 2012 07:39:20 +0000 (10:39 +0300)
committerLeif Åstrand <leif@vaadin.com>
Thu, 12 Apr 2012 07:39:20 +0000 (10:39 +0300)
commitb65f72265230869b03a09c4e8c353f39b8cc1ecf
tree731f563917e0f7316cbf2f5e250d9c7c8c569d26
parenteff08ecdc070f998d4efd5c1f367173d0321708d
parenta6e0aed3ba959bc81b2e97ccd9e1098190501ebb
Merge branch 'layoutgraph'

Conflicts:
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/LayoutManager.java
src/com/vaadin/terminal/gwt/client/ui/AbsoluteLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/AbstractSplitPanelConnector.java
src/com/vaadin/terminal/gwt/client/ui/AccordionConnector.java
src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
src/com/vaadin/terminal/gwt/client/ui/TableConnector.java
src/com/vaadin/terminal/gwt/client/ui/TabsheetConnector.java
src/com/vaadin/terminal/gwt/client/ui/TwinColSelectConnector.java
src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java
src/com/vaadin/terminal/gwt/client/ui/VAccordion.java
src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java
src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/terminal/gwt/client/ui/VTabsheetPanel.java
src/com/vaadin/terminal/gwt/client/ui/VView.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
23 files changed:
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/LayoutManager.java
src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java
src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java
src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java
src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java
src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/gridlayout/VGridLayout.java
src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java
src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java
src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java
src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java