Commit Graph

108 Commits

Author SHA1 Message Date
Mike Adair
d990be61af Merge branch 'three' of https://github.com/tschaub/openlayers into three
Conflicts:
	src/api/loc.js
	src/api/map.js
	src/ol/Map.js
2012-06-19 09:04:04 -04:00
Mike Adair
82f204f30c map get/set methods 2012-06-19 08:06:08 -04:00
Tom Payne
7358529c4e Map fixes. 2012-06-19 13:09:31 +02:00
Mike Adair
818ca7016a interim map test updates 2012-06-19 06:53:59 -04:00
Tom Payne
ef83910c3d Make more Loc tests pass. 2012-06-19 12:33:59 +02:00
Marc Jansen
a6fa08550f change indentation. 2012-06-19 10:51:16 +02:00
Tim Schaub
90f33c587a Debugged. 2012-06-19 10:39:42 +02:00
Tim Schaub
bd6b52c2cd File shuffle. 2012-06-19 09:45:08 +02:00