Merge remote-tracking branch 'origin/master' into f17

This commit is contained in:
TASAKA Mamoru 2012-12-06 13:42:12 +09:00
commit f4878c7f28
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/cairo-1.10.2.gem
/cairo-1.12.2-af3e3fc059.gem
/cairo-1.12.2.gem
/cairo-1.12.3.gem

View File

@ -1 +1 @@
94897684caf2e17dac084f4573e46d5f cairo-1.12.2.gem
f759a4d2a00e7fca6ab44b44d3461558 cairo-1.12.3.gem