Merge branch 'device' into develop
authorPaul Brossier <piem@piem.org>
Tue, 15 Oct 2013 17:07:15 +0000 (19:07 +0200)
committerPaul Brossier <piem@piem.org>
Tue, 15 Oct 2013 17:07:15 +0000 (19:07 +0200)
commitc0fe2a97b0421ede6410a79894278d13e47a4f39
tree817ce4fe988711b5deaf4c96b637796529cf18f5
parentd770fd2cb980beea2fa91897dfaea1e620b164a8
parent0c77921f75bf0a825abe51ef97d9812529a9fa98
Merge branch 'device' into develop
wscript