2 Commits

Author	SHA1	Message	Date
Ingvar Stepanyan	29910d2b2d	XJS -> JSX as per facebook/esprima#83.	2015-01-21 03:00:12 +00:00
Ingvar Stepanyan	d64efe1be4	Merge branch 'upstream' into jsx2 ... Conflicts: acorn.js	2015-01-19 14:12:24 +00:00