<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Chimère/chimere/static, branch v1.1.0</title>
<subtitle>Application en ligne collaborative qui agrège des données géographiques</subtitle>
<id>http://git.iggdrasil.net/Chimère/atom?h=v1.1.0</id>
<link rel='self' href='http://git.iggdrasil.net/Chimère/atom?h=v1.1.0'/>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/'/>
<updated>2010-12-06T22:06:00+00:00</updated>
<entry>
<title>Merge ssh://etienne@daenerys.peacefrogs.net/var/local/git/chimere into carte-ouverte</title>
<updated>2010-12-06T22:06:00+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-06T22:06:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=6238ccee60c079aaccb67e9af7e7acaae01dc563'/>
<id>urn:sha1:6238ccee60c079aaccb67e9af7e7acaae01dc563</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Integration of patch http://trac.osgeo.org/openlayers/changeset/10801 in</title>
<updated>2010-12-06T22:02:38+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-06T22:02:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=86b91da4dc11a5454d722a97906887be2932d146'/>
<id>urn:sha1:86b91da4dc11a5454d722a97906887be2932d146</id>
<content type='text'>
OpenLayers 2.10 (closes #287)
</content>
</entry>
<entry>
<title>Add a local copy of OpenLayers to debug it (refs #287)</title>
<updated>2010-12-06T22:02:12+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-06T21:57:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=a5a86946ce17010ad64366575ff541acbbf933fe'/>
<id>urn:sha1:a5a86946ce17010ad64366575ff541acbbf933fe</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Minor: correct the css</title>
<updated>2010-12-06T21:18:15+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-06T21:18:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=988c9171d4457dc7aa55df696cdb921d59a7cf02'/>
<id>urn:sha1:988c9171d4457dc7aa55df696cdb921d59a7cf02</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into carte-ouverte</title>
<updated>2010-11-21T19:16:47+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-11-21T19:16:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=b0ddd6c8e2db7c33ba8c416440d1fec7a73f393c'/>
<id>urn:sha1:b0ddd6c8e2db7c33ba8c416440d1fec7a73f393c</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Correct checked categories in the permalink (fixes #278)</title>
<updated>2010-11-21T18:59:59+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-11-21T18:59:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=34576994956181e457d1404b9c70a2d71434f856'/>
<id>urn:sha1:34576994956181e457d1404b9c70a2d71434f856</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into carte-ouverte</title>
<updated>2010-11-20T02:51:39+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-11-20T02:51:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=cee23430ae5aca14d5dcd7cf2c52b62b392afcdf'/>
<id>urn:sha1:cee23430ae5aca14d5dcd7cf2c52b62b392afcdf</id>
<content type='text'>
Conflicts:

	chimere/static/styles.css
</content>
</entry>
<entry>
<title>Minor change on the style (bis)</title>
<updated>2010-11-20T02:46:16+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-11-20T02:46:16+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=18f345f7759c25950cdf34b7bd677bf6e983d37f'/>
<id>urn:sha1:18f345f7759c25950cdf34b7bd677bf6e983d37f</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Minor change on the style</title>
<updated>2010-11-20T02:44:34+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-11-20T02:44:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=f297a359e739f7138517ed5bdd7cc6ba910696f8'/>
<id>urn:sha1:f297a359e739f7138517ed5bdd7cc6ba910696f8</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into carte-ouverte</title>
<updated>2010-11-20T01:52:28+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-11-20T01:52:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=63afe4e84cd3be5284a7126264c06ce87d191bc0'/>
<id>urn:sha1:63afe4e84cd3be5284a7126264c06ce87d191bc0</id>
<content type='text'>
Conflicts:

	.gitignore
	chimere/main/actions.py
	chimere/urls.py
</content>
</entry>
</feed>
