From: Raphael Couturier Date: Wed, 24 Apr 2013 21:02:47 +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/c56162cd0df6cb604942d765ca5430092d4199dd?hp=-c 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 --- c56162cd0df6cb604942d765ca5430092d4199dd