aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-15 06:28:46 -0700
committerJose Antonio Marquez2012-03-15 06:28:46 -0700
commitd244f628723399422bb7068bda528bcc0e14c53c (patch)
treea270ef244f81c58d5d1ac9ae65ec55dfdfba36fa /assets/descriptor.json
parent7a9e7ff2e113c95aada64cfccbc140fa77599d57 (diff)
parent67748b4fb19cd5fd210ca711c98d992371c4d2d3 (diff)
downloadninja-d244f628723399422bb7068bda528bcc0e14c53c.tar.gz
Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate
Diffstat (limited to 'assets/descriptor.json')
0 files changed, 0 insertions, 0 deletions