Hugo Mercier e4364f3615 Merge branch 'atlas' into atlas2
Conflicts:
	python/core/composer/qgscomposition.sip
	tests/src/python/CMakeLists.txt
2012-10-04 11:44:18 +02:00
..
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-25 21:29:32 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-26 18:46:52 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00