]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/master' into grid
authorArtur Signell <artur@vaadin.com>
Fri, 12 Dec 2014 08:32:29 +0000 (10:32 +0200)
committerArtur Signell <artur@vaadin.com>
Fri, 12 Dec 2014 08:32:29 +0000 (10:32 +0200)
commit6fdc3320fec5801a73f51d3e3a3584d23d942c6c
treebca21a044acc56530bb403eb1cd3652c01c71928
parentb3e6edc9634f444ccece00e200cb51eee7994d75
parent10fa4e4236ed049ef6eac337d23701bc381763ce
Merge remote-tracking branch 'origin/master' into grid

Conflicts:
server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java

Change-Id: I04938bd8c5b4f01c3ca801c9f7adbb20d279523c
client/src/com/vaadin/client/ApplicationConnection.java
server/src/com/vaadin/data/util/AbstractBeanContainer.java
server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java