From 91e841dbd02be9e453388d70a2d6f7de8a398231 Mon Sep 17 00:00:00 2001 From: Kyle Spraggs Date: Mon, 21 May 2012 15:47:42 -0500 Subject: [PATCH] Updated .gitignore files. Updated composer. --- .gitignore | 3 +-- composer.json | 2 +- composer.lock | 13 +++---------- composer.phar | Bin 482598 -> 482114 bytes vendor/.gitignore | 5 ++++- 5 files changed, 9 insertions(+), 14 deletions(-) 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 a9da6647081f9cdb2fbe05c428e7c3e5d5cc890f..4b03778efb6f2394dffdc7ef33c9408694879cc3 100755 GIT binary patch delta 2344 zcmYk7drXs86u@ukM=5P-3vGe6w3I?ER48qEmePVK;6NT53b3-@ zZc}cyPZKx52g+WsOd+dVwrOV2%vWZ%_}H>H*)m^oI1@J6*K_z|O`2cMz2~0yz29g+ zcXm=YQO;u=j!Xxw;yvMCIv$|aAx_}F5Et-b$Wox3?~ri&Rh1G#==@k0tx~D!TD}f8 z2lyV~G=CXT#<+o1Of7JfSpxinSpjs0qTbHXGLSEYt^qm(?Z88V2H>oq4ptHe1~!|8Rlso}8h<22r+MM%^p$X2zq-H}QGtAT8zI50g4|!z z?WIsLf^;N-3dGqj2eK<*WzJRvTG2#<&e88f{g zq5Ju0P$yA>Vx|P^+bbym#aAN;IsNuZ4{eeM6-D%Wi4rzuLJ4WH`KswSgBIc=Fi&R$ zc4S9H30Rztz`SJAQji;@C17ASoRFchXg9qUkw`B~V`1}m>2eH1hV3lpylgm8J3tR` z?c6JihRtKL4B$;!HdyN9VoX<8eolwv2AVI&L~7)Pp!B93Gyg`O4YDk9q4$w?ILvAY zIePkyVrmen>5eENEsP4Iry`?3`9fqFD4mrN@-f>}L9cP;LM06-G)JMex1vfxahrmW zlA=#vq$65Xj8tG^sfuUdz%E5K@VcS~Xi=_&gQvKWk#z?iKtqBa#+8`Ic_qd@uf#Hz zsIa5ERk>i`oGKkStFi%;qp|FpqH{ogHySJYDEeuT%VN;Zff#JZtr!f<7P}MzQ6>>` zHYQ-^GBDH8SggaD*rMR!L3KIUs9fM-H7wH~)i}x~O)>0uYw+F#G+32Ju0gGhf6Y^S zw3_y+#dMoiL|s}LC|77Pz=K*e_MH|hWQ!|SPcS(DLEdbdtDfY>J@|9dR<)Ln#hJju zwKz;!qpJXUoet+?ShoyPYT;6965c%w-3!<2<*8w4HpuQTExTc(T5kkxk(7{cGX{FN zfzZ(51Q9)=$FV!3$1LadSg9>sFgnv0bC6ZFUQGMq)!_fNc+BWVJl=$O1D4unzzjby z6oDrfH{9&~{z1AVA&D9iRB$*q0hP8VpwbUf+zp@kB>@H_TrZ7WvC-S!(P!=L>OH1{ zG$`L_hodraec@VAUl$lUE;?UZNMQk%(0PbT7Uo=fZkMQc(Ia42aV zP-0pMTx)6qo;S4v(-wJw2Nt3Hc+qN*8_cVKQ|4ZvC3yqzQ1V(JKV=heOUh>8y%e-l zW5M@y+|mYtUNsT&*}e8*%5y8|>oyCGPZdz_Vg+pO=c@ML!B58jZHnpiVkua>v3L#8 zlZp`yr8a{+zrdC>EQOoveAC}CD!L>`ODC*G8gA8sqS=ZD_E|eYp0(mVEl7eBVnu zE}&OTZh9v@j2i9uZsyyu7{m58kY_)aXY#bCmh-fn);aLK@jE&otXmGOY+1%ekUz=r z0h2Skfd@0!0|i;Aw>b;-X0rUS-kgn{zMPGn$<0CMhjY+AlZ%(IKDQq9Kg`8fLg2(J zR_CmQ^%KsgfDfJcB`wRV1NmqkmQm_3GeqL1zsB;KE@wen8!1}@rpQy1+aN5chKS=l+cjsd?bWXkX2TfSmTYWW## z;VOO@`)3$qW0ORTf=!b#Qnt8`iDZZ5jCksO5ffM)+TXX;@I2e;V@&MJJb{MYp28Qg zJI9!~M1PyN$I!X4&(OBP>-Tr~4Za?~uf4-ywkGv@`@5{hJOg__g|8H+8f>YCq>dDq vX#2n(AH)4ar}p>+J0Hd=UJ6V;_jA2DKBwfJIh(^^F_u<^aC1~zR8jOFrWm!< delta 2668 zcmZ`)ZA?>V6n;xDrM)d}fws_=!lkyfAk-EVT1$%{C`0*hI{d6q1rZdeP-Ae}obCr2 z-KM_LtBDR2{L0L9n@YqPoo+@K=SMU%PPfd(&A7y`IGu@^?DiaR_+upG$$8K7o^zga z&U<_2m}&2T>F^X0y9+z{mj{611FT|Z0Pbaq0RLpB0(zp6_d#?y*gr%s0L+op18$eh27D%| z0j!Lf3AjIIHWcv(A*60SJBPlKQ zFhXi9>h#3oL{`O4f{5p1QI|?N8SL50Nf6+fjF9dFIv>3nJBnUXCV}(5vJA^m;W(!V zS&CW?Kct(4ajsYCz}ctD1^h{s2ay&DHIC6&o~GSujuxm<$aM7tAZ=Bn@*mZCV5{PW zW*_H*%e;Y*-lJPeDaY#Rs(2}#5FbO2#Ki;oLR>kJ&Zr1E&bL<3t3tbwWB@`S9;5Ay zpA5v634}~4KDmbOG9oc90fl8HybTvtCsYGoPnZsvshI^Aj|eNHY8iL}1Bqlfq(L3$ zG+6hb2HQAEixXX|bwhx&+A)C7v`#>~4%@y=mk;)5I_&6k-88Vv6EV)FL>$MhL@dmi zG!Y8XSO__jIA9YL*y!FQ?8Awq;>hLA`Y8~jatL?m;h5gh<0@MXrQmNd;JXyV{rc?*mZW#(__NANB%st zPH&_KlC2QoYBEYTm@2?-HsOBsm`XrWtsrTh^x+Peo-8Fr-7CSc5&Ux2je2lYr!>E$Z3139`b*jii&Qg;!8;7 zu+>c*D*T))hD=^zx%tQ8&9o@ZLb)_8Tz01+>Af^0{TeU4@OyXDU@>GV%DAa*!TN@F zM`&@VPYW`r*zAI<`9rwGjH|KN{0^MIG6x}FiI|X=w|{q0kny-V>pZ}7)_TC~^dR7-bhKZj&j)+9Z7yKHEd-cpUkbS0-UukpSO&Nv zV>#fX42&~96Thd2G8aOjSFD7bdQ{&-MZN_3i8GU?W=UvpbOJax3SE2hMXJJL%Spl#Ihp;vqTj3KHYTn<8T3VEEq=y}5DsvctXmenI4UR=%KXc$a zoiYYL?Fo|!xh~DzOm~en(mGcLec+1acX}i;d1NA5VI_ojLbcAh@OfS?q&c?MxY?%> zWZ>5H2H+{|q5h8Li2|?@dQe1C(_u z2RmDy+XnX6xlMrfu`Phx#x4Prj6>e?amc$jt^>{kc{u4yc{mw&J|^FhkMS8dKEj#q znZWcL;q^6@ob_m0OlO1%rgZuQmzUh(2QoCP@P8Yv;S z3-%oohFM1M72ptG6d-wy4~xIx!%G={JYVn6f?xxF{KWs`$Den9A?|%=A$}Kj6><^Y zSKk&^KIRAQA|=1JS)}9FXN%(a7Zb%wexO+t*Wc$5)r-2$xkUZvTv5F;iQ84*kniql z^G5ZzdBvF*Rl%iA!H$Lw&c_AY+k>5ak%GzMPsK1L3YO)X7IAhAH4S$4RR z2qmH{+rOx(wSMTHAog`6{?2xhR`#Dc;iO1o&lnLQ+uzX;E{e3zJ~A2P6re*tHjf(ZZs 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 -- 1.7.10.4