Merge remote-tracking branch 'origin/vs2012' 77/12277/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 13 Aug 2013 18:56:43 +0000 (20:56 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 13 Aug 2013 18:57:01 +0000 (20:57 +0200)
commitdff2a126598b77e642be19c5056a2f89bbd21b60
tree603a76ffeba0b47a53ff363c0b2299401da0ea08
parent093b17de41903849cc46d9c4dccafcbd6527bd29
parent9b746b3e06f7fd5a66fc42135250dd26c2a9174e
Merge remote-tracking branch 'origin/vs2012'

Change-Id: I184e3415eeeb4660ac8aea44037ca441ca493b16