Commit Graph

14 Commits

Author SHA1 Message Date
javi
7c35dda115 Merge remote-tracking branch 'origin/browserify' into update_to_master
Conflicts:
	.gitignore
	.travis.yml
	CHANGELOG.md
	Makefile
	README.md
	bin/mml2json.js
	lib/carto/index.js
	lib/carto/parser.js
	lib/carto/tree/call.js
	lib/carto/tree/filterset.js
	lib/carto/tree/reference.js
	lib/carto/tree/ruleset.js
	package.json
	test/errorhandling.test.js
	test/errorhandling/invalid_value.mss
	test/errorhandling/invalid_value.result
	test/errorhandling/issue297.mss
	test/errorhandling/issue297.result
	test/rendering-mss.test.js
	test/rendering/transforms.mss
	test/rendering/transforms.result
	test/specificity/demo.result
	test/specificity/filters_and_ids.result
	test/specificity/issue60.result
	test/version.test.js
2014-12-04 18:35:24 +01:00
javi
6dc65cc991 update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
javi
dfacf064e8 added frame offset 2013-08-28 11:52:18 +02:00
Yohan Boniface
50a27c213c Add test/rendering-mss/npm-debug.log to .gitignore 2013-08-09 15:37:06 +02:00
Dane Springmeyer
1e6ede278f add to ignores 2012-12-18 16:14:35 -08:00
Dane Springmeyer
3f47fa1898 fix git ignores 2012-03-07 12:50:44 -08:00
Tom MacWright
be5abb3bdc Getting ignores right, tagging 0.4.4 2011-11-29 09:50:05 -05:00
Tom MacWright
5413e9e44c Ignore 2011-10-20 11:38:06 -07:00
Tom MacWright
f03aee60c6 Ignoring more 2011-10-20 11:33:31 -07:00
Young Hahn
5375ca0540 Initial gutting of externals. 2011-07-22 13:48:52 -04:00
Young Hahn
62f1a5e3fd Update .gitignore 2011-07-20 13:57:14 -04:00
Konstantin Käfer
3049adc850 adding test data directory to gitignore 2011-02-08 10:11:53 -05:00
Konstantin Käfer
083b4c2dd2 make paths relative to root of repository 2011-01-25 14:45:07 -05:00
Konstantin Käfer
cabbf4380c gitignore file 2011-01-25 14:44:09 -05:00