From: Pierre-Cyrille Heam Date: Thu, 19 Jan 2012 15:05:25 +0000 (+0100) Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/prng_gpu X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/prng_gpu.git/commitdiff_plain/3010272fc200ffae4e9223ba48c5f3caf05a4256?ds=sidebyside;hp=3010272fc200ffae4e9223ba48c5f3caf05a4256 Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/prng_gpu Conflicts: prng_gpu.tex ---