Author: paultcochrane
Date: Mon Jan  8 02:36:33 2007
New Revision: 16478

Modified:
   trunk/   (props changed)
   trunk/MANIFEST
   trunk/MANIFEST.generated

Log:
svk merge

Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST      (original)
+++ trunk/MANIFEST      Mon Jan  8 02:36:33 2007
@@ -62,9 +62,6 @@
 compilers/imcc/imc.h                                        []
 compilers/imcc/imcc.l                                       []
 compilers/imcc/imcc.y                                       []
-compilers/imcc/imclexer.c                                   []
-compilers/imcc/imcparser.c                                  []
-compilers/imcc/imcparser.h                                  []
 compilers/imcc/instructions.c                               []
 compilers/imcc/instructions.h                               []
 compilers/imcc/main.c                                       []
@@ -1092,9 +1089,6 @@
 languages/cola/examples/oop.cola                            [cola]
 languages/cola/examples/reverse.cola                        [cola]
 languages/cola/gen.c                                        [cola]
-languages/cola/lexer.c                                      [cola]
-languages/cola/parser.c                                     [cola]
-languages/cola/parser.h                                     [cola]
 languages/cola/semant.c                                     [cola]
 languages/cola/sym.c                                        [cola]
 languages/cola/type.c                                       [cola]

Modified: trunk/MANIFEST.generated
==============================================================================
--- trunk/MANIFEST.generated    (original)
+++ trunk/MANIFEST.generated    Mon Jan  8 02:36:33 2007
@@ -60,6 +60,9 @@
 installable_pdb.exe                               [main]bin
 installable_pdump                                 [main]bin
 installable_pdump.exe                             [main]bin
+languages/cola/lexer.c                            [cola]
+languages/cola/parser.c                           [cola]
+languages/cola/parser.h                           [cola]
 libparrot.dll                                     [main]bin
 parrot.pc                                         [main]pkgconfig
 pbc_info                                          [main]bin

Reply via email to