aboutsummaryrefslogtreecommitdiff
path: root/assets/images/scales_normal.png
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-11 22:37:34 -0800
committerJose Antonio Marquez2012-02-11 22:37:34 -0800
commit9f2356c48b831d32d7278648656fe44b98bc4a1f (patch)
tree58459a2e2e45ff2f4ffa9042740040ee17d91dfb /assets/images/scales_normal.png
parent5eb38b8bd779c7fb6e59b966135f8d306378f034 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-9f2356c48b831d32d7278648656fe44b98bc4a1f.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: js/ninja.reel/ninja.html
Diffstat (limited to 'assets/images/scales_normal.png')
-rwxr-xr-xassets/images/scales_normal.pngbin113789 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/assets/images/scales_normal.png b/assets/images/scales_normal.png
deleted file mode 100755
index 87cc77dc..00000000
--- a/assets/images/scales_normal.png
+++ /dev/null
Binary files differ