Skip to content
Snippets Groups Projects
Commit 7a92a2e6 authored by Benjamin Smedberg's avatar Benjamin Smedberg
Browse files

Merge cvs-trunk-mirror to mozilla-central. One conflict resolution: updated...

Merge cvs-trunk-mirror to mozilla-central. One conflict resolution: updated NSPR tag from client.mk into client.py

--HG--
rename : js/src/jsdbgapi.c => js/src/jsdbgapi.cpp
rename : js/src/jsinterp.c => js/src/jsinterp.cpp
rename : js/src/jsobj.c => js/src/jsobj.cpp
rename : js/src/jsopcode.c => js/src/jsopcode.cpp
rename : js/src/jsparse.c => js/src/jsparse.cpp
parents 858a2481 d116bc5e
No related branches found
No related tags found
Loading
Showing
with 96 additions and 84 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment