head	1.2;
access;
symbols
	OSSP_JS_1_6_20070208:1.2
	MOZILLA_JS_1_6_20070208:1.1.1.1
	MOZILLA_JS_1_6_20070102:1.1.1.1
	MOZILLA_JS_1_6_20060916:1.1.1.1
	OSSP_JS_1_6_20060820:1.2
	MOZILLA_JS_1_6_20060820:1.1.1.1
	OSSP_JS_1_6_20060803:1.2
	MOZILLA_JS_1_6_20060803:1.1.1.1
	OSSP_JS_1_6_20060731:1.2
	MOZILLA_JS_1_6_20060731:1.1.1.1
	OSSP_JS_1_6_20060730:1.2
	MOZILLA_JS_1_6_20060730:1.1.1.1
	OSSP_JS_1_6_20060729:1.2
	MOZILLA_JS_1_6_20060729:1.1.1.1
	OSSP_JS_1_6_20060724:1.2
	MOZILLA_JS_1_6_20060724:1.1.1.1
	MOZILLA:1.1.1
	OSSP_JS_1_6_20060722:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.07.24.18.38.26;	author rse;	state Exp;
branches;
next	1.1;
commitid	ZjrCVkA43HotY8Gr;

1.1
date	2006.07.22.11.38.55;	author rse;	state Exp;
branches
	1.1.1.1;
next	;
commitid	S6lxqFmz2kgzIQFr;

1.1.1.1
date	99.04.27.15.18.03;	author rse;	state Exp;
branches;
next	;
commitid	8tZybjOP9mCIV8Gr;


desc
@@


1.2
log
@Resolve conflicts after import of new upstream version: Mozilla JavaScript (SpiderMonkey) 1.6 as of 2006-07-24
@
text
@*.pdb
*.ncb
*.opt
*.plg
Debug
Release
Makefile
jscpucfg
jsautocfg.h
@


1.1
log
@remove more stuff and ignore generated files
@
text
@d1 8
a9 1
*.lo
@


1.1.1.1
log
@Import new upstream version: Mozilla JavaScript (SpiderMonkey) 1.6 as of 2006-07-24
@
text
@a0 8
*.pdb
*.ncb
*.opt
*.plg
Debug
Release
Makefile
jscpucfg
d2 1
@