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

..

algorithms

remove .cvsignore files

2010-08-28 22:35:41 +00:00

bench

add 'foreach' to astyle and re-run indentation

2012-08-03 06:57:11 +02:00

qt_modeltest

add 'foreach' to astyle and re-run indentation

2012-08-03 06:57:11 +02:00

src

Merge branch 'atlas' into atlas2

2012-10-04 11:44:18 +02:00

testdata

Revert "Revert "Merge pull request #245 from Oslandia/atlas_integration""

2012-10-04 11:18:17 +02:00

CMakeLists.txt

Revert most Mac hacks for testing in favor of 4cfc365

2012-08-26 17:27:18 -06:00

ctest2junix.xsl

Added xslt for transforming CTest results to Junit for Jenkins. Source: https://gist.github.com/2358656

2012-07-20 12:06:52 +02:00