Merge branch 'master' of git+ssh://scm.forge.imag.fr/scmrepos/git/ocl-icd/ocl-icd
authorVincent Danjean <Vincent.Danjean@ens-lyon.org>
Mon, 11 Feb 2013 12:50:29 +0000 (13:50 +0100)
committerVincent Danjean <Vincent.Danjean@ens-lyon.org>
Mon, 11 Feb 2013 12:50:29 +0000 (13:50 +0100)
commit60daa49642f964299ab2098e27e04eed265321ae
tree2bbe4f8e39b82e53ae67cc168cebdec9052d2e54
parentf08ab4a67953128ff19965a9d4735e764559e1d6
parent1a35c9bce9702e2141974ee3c01a10cfe4062ce8
Merge branch 'master' of git+ssh://scm.forge.imag.fr/scmrepos/git/ocl-icd/ocl-icd