diff options
author | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-09-29 16:44:16 +0000 |
---|---|---|
committer | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-09-29 16:44:16 +0000 |
commit | 8f95159f0f6f551c08c5f6e1a4d8807b332bc21a (patch) | |
tree | 74361aedc5a1372fab26b8d5802ff1d156440208 /global.sym | |
parent | 07b7370725c6ec32f15c00e2d8d38d18f4b75a2d (diff) | |
parent | 7cb3fdbc2b45d54cfc6aac117f89b42d632cb3ed (diff) | |
download | perl-8f95159f0f6f551c08c5f6e1a4d8807b332bc21a.tar.gz |
Start merge with maint-5.004 branch by creating an ancestral
branch point via a fake resolution with the maint-merge branch.
See Perforce Tech Note 9 for details.
p4raw-id: //depot/perl@77
Diffstat (limited to 'global.sym')
-rw-r--r-- | global.sym | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/global.sym b/global.sym index 497e1c4ea5..f7d11f22ad 100644 --- a/global.sym +++ b/global.sym @@ -200,7 +200,6 @@ rsfp rsfp_filters rshift_amg rshift_ass_amg -runops savestack savestack_ix savestack_max @@ -1016,6 +1015,7 @@ rsignal rsignal_save rsignal_state rsignal_restore +runops rxres_free rxres_restore rxres_save @@ -1096,7 +1096,6 @@ sv_2uv sv_add_arena sv_backoff sv_bless -sv_bless3 sv_catpvf sv_catpv sv_catpvn |