]> source.dussan.org Git - gwtquery.git/commit
Merge branch 'master' into mcm_styling
authorManolo Carrasco <manolo@apache.org>
Fri, 2 Jan 2015 13:17:01 +0000 (14:17 +0100)
committerManolo Carrasco <manolo@apache.org>
Fri, 2 Jan 2015 13:17:01 +0000 (14:17 +0100)
commitbbb781795cb27391483139dda2166717b751b778
tree8f217d25f15e876c605329b3ae10e11ef1c95a62
parentcbacf2f2171f1ba276e2d9e094ca34e6fb2f357f
parent26cc9ab92f71ffe2836c00764c1e0d92f9816642
Merge branch 'master' into mcm_styling

Conflicts:
gwtquery-core/src/main/java/com/google/gwt/query/client/IsProperties.java
gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java
gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
gwtquery-core/src/main/java/com/google/gwt/query/client/IsProperties.java
gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java
gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java
gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsUtils.java
gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java
gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java