From: Kyle Spraggs <theman@spiffyjr.me>
Date: Mon, 21 May 2012 20:47:42 +0000 (-0500)
Subject: Updated .gitignore files.
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=91e841dbd02be9e453388d70a2d6f7de8a398231;p=zf2.biz%2Fapplication_blanche.git

Updated .gitignore files.
Updated composer.
---

diff --git a/.gitignore b/.gitignore
index 594b8d6..f86d474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@ nbproject
 .DS_Store
 .idea
 .project
-.settings
-vendor/*
+.settings
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 5dee8be..9927db9 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,6 @@
     "homepage": "http://framework.zend.com/",
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zendframework": "dev-master"
+        "zendframework/zendframework": "dev-master#fedd11dce74ca2ec20c1370915be06615e91b9d2"
     }
 }
diff --git a/composer.lock b/composer.lock
index 6f60f53..f065235 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,24 +1,17 @@
 {
-    "hash": "0dec7f0ed037ec44a5f067188ff04355",
+    "hash": "0e4df5f8d763b0d0514042f4ce9ebe32",
     "packages": [
         {
             "package": "zendframework/zendframework",
             "version": "dev-master",
-            "source-reference": "05a3d6ee7fc69a5687bdb8c36dea711a294f10b0",
+            "source-reference": "fedd11dce74ca2ec20c1370915be06615e91b9d2",
             "alias-pretty-version": "2.0.x-dev",
             "alias-version": "2.0.9999999.9999999-dev"
         },
         {
             "package": "zendframework/zendframework",
             "version": "dev-master",
-            "source-reference": "05a3d6ee7fc69a5687bdb8c36dea711a294f10b0"
-        },
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "0a3c5746b98e26a958e95e172be07124b3ba08ae",
-            "alias-pretty-version": "2.0.x-dev",
-            "alias-version": "2.0.9999999.9999999-dev"
+            "source-reference": "fedd11dce74ca2ec20c1370915be06615e91b9d2"
         }
     ],
     "packages-dev": null,
diff --git a/composer.phar b/composer.phar
index a9da664..4b03778 100755
Binary files a/composer.phar and b/composer.phar differ
diff --git a/vendor/.gitignore b/vendor/.gitignore
index 2ea56ad..4578c85 100644
--- a/vendor/.gitignore
+++ b/vendor/.gitignore
@@ -1,2 +1,5 @@
 !.gitignore
-!README.md
+.composer
+composer
+zendframework
+autoload.php