Konstantin Käfer 5135c59b71 Merge branch 'master' into outdoors-style ...

Conflicts:
	bin/style.js
	src/map/map.cpp

2014-05-13 16:18:52 +02:00

..

build-shaders.js

correctly build shaders if the optimizer is not present

2014-04-11 16:23:06 -04:00

build-style.js

clean up build system and reuse previously built libraries in other targets

2014-04-11 11:29:18 -07:00

lazy-update.js

clean up build system and reuse previously built libraries in other targets

2014-04-11 11:29:18 -07:00

package.json

move node modules to bin/ folder to fix build

2014-03-26 11:51:05 +01:00

style.js

Merge branch 'master' into outdoors-style

2014-05-13 16:18:52 +02:00