]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/master' into grid
authorJohn Ahlroos <john@vaadin.com>
Thu, 7 Aug 2014 13:32:23 +0000 (16:32 +0300)
committerJohn Ahlroos <john@vaadin.com>
Thu, 7 Aug 2014 13:35:06 +0000 (16:35 +0300)
commitecff9648d1cb3d5cc4bd54d2b1e1c6357429792f
treeb21f4b599183c157900b0f24d41c94e6af3b08a7
parente5230e6a2433f5c8a74c66b73e96d0454866d316
parentff47bdd97b03a42dfc812b4dc9ad71fa45ce3827
Merge remote-tracking branch 'origin/master' into grid

Conflicts:
WebContent/release-notes.html

Change-Id: Ie05bea7142134a7a9d655fcdf6ca232fd13c742b
client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java