[svn:parrot] r39378 - branches/pmc_pct

cotto at svn.parrot.org cotto at svn.parrot.org
Thu Jun 4 02:37:23 UTC 2009


Author: cotto
Date: Thu Jun  4 02:37:22 2009
New Revision: 39378
URL: https://trac.parrot.org/parrot/changeset/39378

Log:
[manifest] update the MANIFEST, just in case someone feels like trying to build from this branch

Modified:
   branches/pmc_pct/MANIFEST

Modified: branches/pmc_pct/MANIFEST
==============================================================================
--- branches/pmc_pct/MANIFEST	Thu Jun  4 02:32:48 2009	(r39377)
+++ branches/pmc_pct/MANIFEST	Thu Jun  4 02:37:22 2009	(r39378)
@@ -1,14 +1,10 @@
 # ex: set ro:
 # $Id$
 #
-<<<<<<< .working
-# generated by tools/dev/mk_manifest_and_skip.pl Sun May 17 03:53:15 2009 UT
-=======
-# generated by tools/dev/mk_manifest_and_skip.pl Sun May 24 16:30:09 2009 UT
->>>>>>> .merge-right.r39376
+# generated by tools/dev/mk_manifest_and_skip.pl Thu Jun  4 02:33:25 2009 UT
+#
+# See below for documentation on the format of this file.
 #
-# See tools/dev/install_files.pl for documentation on the
-# format of this file.
 # See docs/submissions.pod on how to recreate this file after SVN
 # has been told about new or deleted files.
 CREDITS                                                     []
@@ -260,6 +256,7 @@
 compilers/tge/TGE/Rule.pir                                  [tge]
 compilers/tge/TGE/Tree.pir                                  [tge]
 compilers/tge/tgc.pir                                       [tge]
+compilers/vtdumper/src/function.pir                         [vtdumper]
 compilers/vtdumper/src/parser/actions.pm                    [vtdumper]
 compilers/vtdumper/src/parser/grammar.pg                    [vtdumper]
 compilers/vtdumper/t/vtable.tbl                             [test]
@@ -1829,6 +1826,7 @@
 t/op/64bit.t                                                [test]
 t/op/annotate.t                                             [test]
 t/op/arithmetics.t                                          [test]
+t/op/arithmetics_pmc.t                                      [test]
 t/op/basic.t                                                [test]
 t/op/bitwise.t                                              [test]
 t/op/box.t                                                  [test]
@@ -2096,6 +2094,7 @@
 t/tools/install/testlib/parrot.pc                           [test]
 t/tools/install/testlib/phony                               [test]
 t/tools/install/testlib/phony.exe                           [test]
+t/tools/install/testlib/runtime/parrot/include/sockets.pasm [test]
 t/tools/install/testlib/runtime/parrot/library/TGE.pbc      [test]
 t/tools/install/testlib/src/ops/ops.num                     [test]
 t/tools/install/testlib/src/pmc/pmc_object.h                [test]


More information about the parrot-commits mailing list