json-glib r37 - in branches/json-glib-0-6: . json-glib

[ebassi svn gnome org]

Author: ebassi
Date: Tue May 20 08:51:28 2008
New Revision: 37
URL: http://svn.gnome.org/viewvc/json-glib?rev=37&view=rev

Log:
2008-05-20  Emmanuele Bassi  <ebassi openedhand com>

	Merge from trunk:

	* json-glib/json-glib.h: Remove json-scanner.h and fix
	the general include file.

Modified:
   branches/json-glib-0-6/ChangeLog
   branches/json-glib-0-6/json-glib/json-glib.h

Modified: branches/json-glib-0-6/json-glib/json-glib.h
==============================================================================
--- branches/json-glib-0-6/json-glib/json-glib.h	(original)
+++ branches/json-glib-0-6/json-glib/json-glib.h	Tue May 20 08:51:28 2008
@@ -2,7 +2,6 @@
 #define __JSON_GLIB_H__
 
 #include <json-glib/json-types.h>
-#include <json-glib/json-scanner.h>
 #include <json-glib/json-generator.h>
 #include <json-glib/json-parser.h>
 #include <json-glib/json-version.h>