From: yasushiito <yas@pen-chan.jp>
Date: Tue, 30 Oct 2012 07:49:35 +0000 (+0900)
Subject: change ignore
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=ecaf0e9ae0379abf4f1f81429c5d0b6f58ce4d24

change ignore
---

diff --git a/.gitignore b/.gitignore
index 7d019e64..e4e9cd8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ db/*.sqlite3
 db/schema.rb
 log/*.log
 tmp/
+Gemfile.lock
 .sass-cache/
 public/image/*
 config/aws.yaml
diff --git a/Gemfile.lock b/Gemfile.lock
index 0e4fe125..d2e35f4a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.4.0)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -97,17 +97,17 @@ GEM
     multi_json (1.3.6)
     nokogiri (1.5.5-x86-mingw32)
     orm_adapter (0.0.7)
-    pettanr_creative_commons_v30_licenses (0.0.3)
+    pettanr_creative_commons_v30_licenses (0.0.4)
       rails (~> 3.1.1)
-    pettanr_pettan_commons_v01_licenses (0.0.4)
+    pettanr_pettan_commons_v01_licenses (0.0.5)
       rails (~> 3.1.1)
-    pettanr_pettan_protected_v01_licenses (0.0.4)
+    pettanr_pettan_protected_v01_licenses (0.0.6)
       rails (~> 3.1.1)
-    pettanr_pettan_public_v01_licenses (0.0.4)
+    pettanr_pettan_public_v01_licenses (0.0.6)
       rails (~> 3.1.1)
-    pettanr_public_domain_v01_licenses (0.0.3)
+    pettanr_public_domain_v01_licenses (0.0.4)
       rails (~> 3.1.1)
-    pettanr_unknown_v01_licenses (0.0.4)
+    pettanr_unknown_v01_licenses (0.0.5)
       rails (~> 3.1.1)
     pg (0.14.1-x86-mingw32)
     polyglot (0.3.3)
@@ -178,10 +178,10 @@ GEM
     therubyracer-heroku (0.8.1.pre3)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.11)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.34)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)