From: couturie <couturie@extinction>
Date: Thu, 25 Apr 2013 15:03:38 +0000 (+0200)
Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/book_gpu
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/book_gpu.git/commitdiff_plain/32bc153a6a82be882b13679314a6f1e8021de074?hp=32bc153a6a82be882b13679314a6f1e8021de074

Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/book_gpu

Conflicts:
	BookGPU/Chapters/chapter12/ch12.aux
	BookGPU/Chapters/chapter16/ch16.aux
	BookGPU/Chapters/chapter17/ch17.aux
	BookGPU/Chapters/chapter18/ch18.aux
	BookGPU/Chapters/chapter6/ch6.aux
---