Merge branch 'system-json-glib'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Mon, 10 Aug 2009 16:21:20 +0000 (17:21 +0100)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Mon, 10 Aug 2009 16:21:20 +0000 (17:21 +0100)
commitd0748b3b9b34bf77ed3b813e3872cac64d6a6c35
treebed0916d96e97ad4947867b42412f8ee189d6a49
parentd263e7a78b7e98b2b87a51a194b93473344b6b27
parentdf572d089c0811ecbc5e41d1c68d39fae47040e9
Merge branch 'system-json-glib'

* system-json-glib:
  [script] Simplify the parser code
  Update JSON-GLib dependency
clutter/Makefile.am
configure.ac