Changeset 268 for branches/branch-1.2/zoo-kernel/main_conf_read.y

Timestamp:

Jul 16, 2011, 12:58:47 PM (13 years ago)

Author:

djay

Message:

Merge branch-1.2 to current rev. 267. Tag release-1.2.0-rc2.

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-kernel/main_conf_read.y (modified) (1 diff)

branches/branch-1.2/zoo-kernel/main_conf_read.y

@@ -47 +47 @@
 /* le type des lval des jetons et des elements non terminaux bison */
 //======================================================
-%union 
-{
-   char * s;
-}
-%union { char* chaine; char* key;char* val;}
+%union { char* s;char* chaine; char* key;char* val;}
 //======================================================