git.shadowcat.co.uk Git - p5sagit/p5-mst-13.2.git/commit

projects / p5sagit/p5-mst-13.2.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 10a6751 2b260de)

author	Jarkko Hietaniemi <jhi@iki.fi>
	Wed, 27 Oct 1999 14:06:44 +0000 (14:06 +0000)
committer	Jarkko Hietaniemi <jhi@iki.fi>
	Wed, 27 Oct 1999 14:06:44 +0000 (14:06 +0000)
commit	1ae6be1c7649fa55b3105031a58ffe146fa4f2fd
tree	2bdf0dec28a91f5b0e5b8445ed6c203c64e7268a	tree \| snapshot
parent	10a675193b1a7d3751e2d04a91c294c6be9dfaf7	commit \| diff
parent	2b260de0f3727bc62519897f69d6f752c97d8502	commit \| diff

Integrate with Sarathy; manual resolve on regcomp.c conflicts
(Ilya's changes won).

p4raw-id: //depot/cfgperl@4468

14 files changed:

deb.c	diff1 \|	diff2 \|	blob \| history
dump.c	diff1 \|	diff2 \|	blob \| history
embed.pl	diff1 \|	diff2 \|	blob \| history
mg.c	diff1 \|	diff2 \|	blob \| history
op.c	diff1 \|	diff2 \|	blob \| history
perl.c	diff1 \|	diff2 \|	blob \| history
perl.h	diff1 \|	diff2 \|	blob \| history
perlapi.c	diff1 \|	diff2 \|	blob \| history
pod/perldelta.pod	diff1 \|	diff2 \|	blob \| history
pod/perldiag.pod	diff1 \|	diff2 \|	blob \| history
pp.c	diff1 \|	diff2 \|	blob \| history
proto.h	diff1 \|	diff2 \|	blob \| history
regcomp.c	diff1 \|	diff2 \|	blob \| history
sv.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file to name it for gitweb.