summaryrefslogtreecommitdiffstats
path: root/scripting/examples/javascript
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-11-12 06:06:36 +0100
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-11-12 06:06:36 +0100
commitbf9435bce063da95deb8a52371bce04e7435c966 (patch)
tree5321aeed1d7c1c402497f522d4224cf1aac523e0 /scripting/examples/javascript
parentadd quick way to enable OpenGL backend through env var (diff)
downloadcore-bf9435bce063da95deb8a52371bce04e7435c966.tar.gz
core-bf9435bce063da95deb8a52371bce04e7435c966.zip
Revert "Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir"""
This reverts commit 80c83f4a578e1ec0c8b5e439687716e365937c9a.
Diffstat (limited to 'scripting/examples/javascript')
0 files changed, 0 insertions, 0 deletions