Conflicts:
	.gitignore
	.jshintrc
	CHANGELOG.md
	Makefile
	build/browser-header.js
	lib/less/browser.js
	lib/less/functions.js
	lib/less/rhino.js
	lib/less/tree/dimension.js
	lib/less/tree/value.js
	package.json
	test/browser-test-prepare.js
	test/browser/common.js
	test/browser/css/relative-urls/urls.css
	test/browser/css/urls.css
	test/browser/template.htm
	test/css/compression/compression.css
	test/css/static-urls/urls.css
	test/css/urls.css
	test/less-test.js
This commit is contained in:
Luke Page
2013-09-04 23:12:34 +01:00
46 changed files with 1546 additions and 496 deletions

View File

@@ -1,11 +1,11 @@
<script src="/browser/jasmine.js" type="text/javascript"></script>
<script src="/browser/jasmine-html.js" type="text/javascript"></script>
<script src="/browser/common.js" type="text/javascript"></script>
<script src="/browser/es5.js" type="text/javascript"></script>
<script src="/browser/runner-{runner-name}.js" type="text/javascript"></script>
<script src="/browser/less.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="/browser/jasmine.css" />
</head>
<body>
</body>
<script src="/browser/jasmine.js" type="text/javascript"></script>
<script src="/browser/jasmine-html.js" type="text/javascript"></script>
<script src="/browser/common.js" type="text/javascript"></script>
<script src="/browser/es5.js" type="text/javascript"></script>
<script src="/browser/runner-{runner-name}.js" type="text/javascript"></script>
<script src="/browser/less.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="/browser/jasmine.css" />
</head>
<body>
</body>
</html>