Permalink
Browse files

[html_cleanup] merge in master, fix conflicts

  • Loading branch information...
2 parents 587edd7 + c3f2c98 commit d130ad7800e6dd899bfd3b6fe44764f68b428f70 @mikehh mikehh committed Dec 14, 2010
Showing 1,920 changed files with 26,067 additions and 61,612 deletions.
View
1,047 .gitignore

Large diffs are not rendered by default.

Oops, something went wrong.
View
54 CREDITS
@@ -1,6 +1,5 @@
=pod
-# $Id$
Following in the steps of other open source projects that
eventually take over the world, here is the partial list
@@ -16,6 +15,7 @@
The Parrot Team
PS: Yes, this looks remarkably like the Linux CREDITS format
PPS: This file is encoded in UTF-8
+ PPPS: To turn this file into a author map for git-svn, see tools/dev/mk_author_map.pl
----------
N: Aaron Sherman
@@ -241,7 +241,7 @@ E: cdolan@cpan.org
N: Chris Fields (cjfields)
D: Rakudo patches
-N: Christoph Otto a.k.a. cotto
+N: Christoph Otto
U: cotto
D: Patch for key flags in pdd08
D: Range check in Env PMC
@@ -291,6 +291,8 @@ D: imcc optimizer and register allocator patches and tests
E: cgrawls@gmail.com
U: cxreg
+N: Dave Olszewski
+E: cxreg@pobox.com
D: copyright test cleanup
N: Damian Miles Knopp
@@ -364,6 +366,12 @@ W: http://eric.lubow.org/
N: Felix Gallo
D: delegate.pmc patch
+N: Fernando Brito
+E: email@fernandobrito.com
+D: GCI Student
+U: fbrito
+S: João Pessoa, Brazil
+
N: Flavio Poletti
D: SmartLink patch for Moose after 0.43
@@ -402,6 +410,7 @@ D: Documentation patch for Parrot_PMC_get_pointer_intkey()
N: Géraud Continsouzas
U: GeJ
+E: geraud@gcu.info
A: geraud
D: Perl2Pir tests conversion
D: Miscellaneous codingstd fixes
@@ -456,7 +465,7 @@ D: string.pmc, complex.pmc
N: isop
D: various Pynie patches
-N: James E Keenan (Jim) (aka kid51)
+N: James E Keenan
E: jkeenan@cpan.org
U: jkeenan
D: Testing of configuration and build tools
@@ -500,7 +509,7 @@ E: jquelin@cpan.org
U: jquelin
S: Lyon, France
-N: Jerry Gay a.k.a. particle
+N: Jerry Gay
U: particle
E: Jerry.Gay@gmail.com
D: Whatever
@@ -531,7 +540,7 @@ D: coding standard tests
N: John Paul Wallington
D: pir-mode.el: fix for xemacs plus bugfixes and cleanups
-N: Jonathan Leto
+N: Jonathan "Duke" Leto
E: jonathan@leto.net
W: http://leto.net
D: Release manager for 1.7.0
@@ -672,7 +681,7 @@ D: Bug fix
N: Marcus Thiesen
D: URM language, bugfixes
-N: Mark Glines a.k.a. Infinoid
+N: Mark Glines
U: infinoid
D: Cage cleaning, random bugfixes, report bugs
E: mark@glines.org
@@ -702,6 +711,9 @@ D: Resizable*Array PMCs
N: Matt Kennedy
D: Some Env PMC method implementations and tests
+N: Matt Rajca
+D: Code refactoring
+
N: Mattia Barbon
D: Win32 fixes, dynamic PMC creation and loading
@@ -751,8 +763,7 @@ D: Patch reducing code duplication
N: Mitchell N Charity
-N: Moritz A Lenz
-A: Moritz Lenz
+N: Moritz Lenz
E: moritz@faui2k3.org
U: moritz
D: Test infrastructure for languages/perl6/ and Perl 6 in general
@@ -787,6 +798,11 @@ U: nwellnhof
N: Nikolay Ananiev
D: Win32 build fix
+N: Nolan Lum
+E: nol888@gmail.com
+D: Test coverage improvement.
+U: Yuki`N
+
N: Norman Nunley
D: Shaving a Ponie
E: nnunley@gmail.com
@@ -806,7 +822,7 @@ N: Ovid
D: Rename 'pbc_to_c' to 'pbc_to_exe'
N: Paco Alguacil
-D: Building on various platorms
+D: Building on various platforms
E: paco.linux@gmail.com
N: Pancake
@@ -1036,9 +1052,14 @@ U: tcurtis
E: tyler.l.curtis@gmail.com
E: ekiru.0@gmail.com
D: PAST Optimization GSoC 2010
+D: Release manager for 2.10.0
A: tylercurtis
A: ekiru
+N: Tadeusz Sośnierz
+U: tadzik
+E: tadzikes@gmail.com
+
N: Ujwal Reddy Malipeddi
U: ujwalic
E: ujwalic@gmail.com
@@ -1084,18 +1105,3 @@ U: svn
E: svn@perl.org
=cut
-
-# This makes a "svn authors" file for git svn
-
-open my $fh, "<", $0 or die "can't open $0: $!";
-my %n;
-while (<$fh>) {
- #warn "[$_]";
- if (m/^\s*$/) {
- printf "%-10s = %s <%s>\n", $n{U}, $n{N}, $n{E} if $n{U};
- %n = ();
- }
- next unless m/^([NEDUSW]): (.*)/;
- my ($f, $v) = ($1, $2);
- $n{$f} = $v unless $n{$f}; # doesn't do the right thing for the multiline fields
-}
View
@@ -1,5 +1,9 @@
#1 $Id$
+2010.11.16 tcurtis
+ * Released 2.10.0
+ See NEWS for more.
+
2010.10.19 Gerd
* Released 2.9.0
See NEWS for more.
@@ -228,7 +232,7 @@
well as keys; the corresponding namespace PMC methods are gone.
2006.07.21 leo
- * Parrot_exit, Parrot_on_exit take now an Interp * argument
+ * Parrot_x_exit, Parrot_x_on_exit take now an Interp * argument
2006.07.25 chip
* add experimental op find_type_i_p
@@ -1446,7 +1450,7 @@
* string.c: When you clone a constant, it ain't constant no mo'.
- Cocurtesy of "Bryan C. Warnock" <Bryan.Warnock@raba.com>
+ Courtesy of "Bryan C. Warnock" <Bryan.Warnock@raba.com>
2002-02-28 00:51 dan
@@ -2352,7 +2356,7 @@
2002-01-30 19:08 dan
- * lib/Parrot/Assembler.pm: fixes the POD in Parrot::Assember so
+ * lib/Parrot/Assembler.pm: fixes the POD in Parrot::Assembler so
that perldoc
can read it and just tidies it up generally. It also adds
documentation
@@ -3165,7 +3169,7 @@
2002-01-13 19:39 dan
- * key.c, classes/perlarray.pmc: key.c: intialize KEY.keys
+ * key.c, classes/perlarray.pmc: key.c: initialize KEY.keys
classes/perlarray.c: * get_string: is casting
SELF->cache.struct_val to a STRING*, while all other methods are
@@ -8335,7 +8339,7 @@
* assemble.pl: macro expansion. Here's the test macro I was using:
- # this uses I32,I31 as temporaries. # macro must be preceeded by a
+ # this uses I32,I31 as temporaries. # macro must be preceded by a
label. testi macro num,got,want print "Test #"
print num print "..." set I32,want set
I31,got eq I32,I31,$ok print "NG\n" branch
View
@@ -1,7 +1,6 @@
#! perl
# Copyright (C) 2001-2009, Parrot Foundation.
-# $Id$
use 5.008;
use strict;
@@ -631,7 +630,6 @@ =head2 Example
auto::signal
auto::socklen_t
auto::env
- auto::extra_nci_thunks
auto::gmp
auto::readline
auto::pcre
Oops, something went wrong.

0 comments on commit d130ad7

Please sign in to comment.