Jeff Williams e7752cde18 Merge branch 'master' into parsimony ...

Conflicts:
	lib/jsdoc/name.js
	lib/jsdoc/src/handlers.js
	lib/jsdoc/src/parser.js
	lib/jsdoc/tag/dictionary/definitions.js
	lib/jsdoc/util/templateHelper.js
	package.json
	test/specs/documentation/alias.js
	test/specs/documentation/modules.js
	test/specs/tags/augmentstag.js
	test/specs/tags/overviewtag.js

2013-10-21 08:42:29 -07:00

..

lib

Added Jake build script.

2011-06-18 12:52:24 +01:00

templates

Merge branch 'master' into parsimony

2013-10-21 08:42:29 -07:00