]> source.dussan.org Git - gwtquery.git/commitdiff
Merge branch 'mcm_jsonbuilder_jvm' of github.com:gwtquery/gwtquery into mcm_jsonbuild...
authorManuel Carrasco Moñino <manuel.carrasco.m@gmail.com>
Wed, 22 Jan 2014 07:11:45 +0000 (07:11 +0000)
committerManuel Carrasco Moñino <manuel.carrasco.m@gmail.com>
Wed, 22 Jan 2014 07:11:45 +0000 (07:11 +0000)
Conflicts:
gwtquery-core/src/main/java/com/google/gwt/query/vm/AjaxTransportJre.java


Trivial merge