aboutsummaryrefslogtreecommitdiff
path: root/js/io/templates/descriptor.json
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-08 14:53:40 -0800
committerJose Antonio Marquez2012-02-08 14:53:40 -0800
commit5a69d5be181ea98fa842977885ebd8c861dda6ca (patch)
treea417e0e6bc41c417a33017299c40435e6d557d09 /js/io/templates/descriptor.json
parent2133bd1e74864b4b69d824ba7977fa07034af962 (diff)
parent0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff)
downloadninja-5a69d5be181ea98fa842977885ebd8c861dda6ca.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: manifest.json
Diffstat (limited to 'js/io/templates/descriptor.json')
0 files changed, 0 insertions, 0 deletions