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

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

projects / vaadin-framework.git / commit

author	Johannes Dahlström <johannesd@vaadin.com>
	Mon, 27 Aug 2012 09:40:41 +0000 (12:40 +0300)
committer	Johannes Dahlström <johannesd@vaadin.com>
	Mon, 27 Aug 2012 09:40:41 +0000 (12:40 +0300)
commit	a67ca492c18451c0f286e90b3a5fb34bde2d3c47
tree	77f8879242385bfa6f970bfb129531dd32ce242a	tree \| snapshot
parent	c8cee295021dcd33982217e3ad1c374bfca63a29	commit \| diff
parent	fc3f7f62b05ae69b242d64084f676d7733962c60	commit \| diff

Merge branch 'master' into root-cleanup

Rename Root -> UI in root cleanup code

Conflicts:
client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
server/src/com/vaadin/ui/UI.java

15 files changed:

client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/terminal/gwt/client/ui/UI/UIConnector.java	\|	diff2 \|	blob \| history
server/src/com/vaadin/Application.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/DeploymentConfiguration.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/Constants.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/ui/UI.java	\|	diff2 \|	blob \| history
shared/src/com/vaadin/shared/ApplicationConstants.java	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/terminal/gwt/client/ui/UI/UIConnector.java	\|	diff2 \|	blob \| history
server/src/com/vaadin/Application.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/DeploymentConfiguration.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/Constants.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/ui/UI.java	\|	diff2 \|	blob \| history
shared/src/com/vaadin/shared/ApplicationConstants.java	diff1 \|	diff2 \|	blob \| history