aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-16 17:19:27 -0800
committerJose Antonio Marquez2012-02-16 17:19:27 -0800
commit7e5cbc9eac21b9799581c34bb99aa942d4f9ad10 (patch)
treef925ded2e26ecabd777ead1e443fe09f9a358c70 /assets/descriptor.json
parent2234edc2a3aed40175b5cfb6a9f7aaaea2b7aae6 (diff)
parentf0590347bc5fe810838b14a6035fbef35b5616c5 (diff)
downloadninja-7e5cbc9eac21b9799581c34bb99aa942d4f9ad10.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'assets/descriptor.json')
0 files changed, 0 insertions, 0 deletions