From e816fb5f4263cc81cdf3190ba6ff3203b2b4e039 Mon Sep 17 00:00:00 2001
From: Ombridride <quentinbd@gmail.com>
Date: Thu, 11 Dec 2014 18:53:24 +0100
Subject: [PATCH] Merge server to github 02

---
 .../mods/flowers/textures/flowers_viola.png       | Bin 0 -> 175 bytes
 mods/farming/textures/farming_cotton_4.png        | Bin 0 -> 220 bytes
 mods/farming/textures/farming_soil_wet_side.png   | Bin 0 -> 721 bytes
 mods/farming/textures/farming_wheat_2.png         | Bin 0 -> 185 bytes
 mods/farming/textures/farming_wheat_3.png         | Bin 0 -> 228 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 minetestforfun_game/mods/flowers/textures/flowers_viola.png
 create mode 100755 mods/farming/textures/farming_cotton_4.png
 create mode 100755 mods/farming/textures/farming_soil_wet_side.png
 create mode 100755 mods/farming/textures/farming_wheat_2.png
 create mode 100755 mods/farming/textures/farming_wheat_3.png

diff --git a/minetestforfun_game/mods/flowers/textures/flowers_viola.png b/minetestforfun_game/mods/flowers/textures/flowers_viola.png
new file mode 100644
index 0000000000000000000000000000000000000000..143044a45b315b521667e28b7e151331dc9c77b6
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=1#IEPk`tN&~8A8vi$D
zD7Wx6_DC`GOmGOvcL0jS{&)5SDq<}O@(Tvi3=D^|*){?x3r`ov5RT~Ngat|l4YN|W
zN}P(4Vin)Wv{|fxODC3L$=*d4Tss;}w2w3Kxt6uD^2qS8<|w`75oQqA;;dWPYSIic
N%hT1*Wt~$(69B8>E))O&

literal 0
HcmV?d00001

diff --git a/mods/farming/textures/farming_cotton_4.png b/mods/farming/textures/farming_cotton_4.png
new file mode 100755
index 0000000000000000000000000000000000000000..d0096da395270fa79bff41fabd7658972f73d47f
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#E~_XnljP)USLOnRsy$sCLo7}wCrGd!=DZ<s;?MFE492-D|J!ZTs^HydI^}3S
zryVPwTG4;q(xo4z6ISW|ynir)Z_SCLF^ubO+zk1*f8{il!niHhrvKwN;)pzR(x>sq
z2gC1I|Murt2i6^b#uc$<N0i1t_QXlaM+INx2OOBVRFchSi^@M?FL{RRPc+}Oy?8tw
P=nMu=S3j3^P6<r_`TSAZ

literal 0
HcmV?d00001

diff --git a/mods/farming/textures/farming_soil_wet_side.png b/mods/farming/textures/farming_soil_wet_side.png
new file mode 100755
index 0000000000000000000000000000000000000000..6bd3a56cb6d20ea9431a48c9cd0dafebc0a3af59
GIT binary patch
literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007*Nkl<Zc-lQu
zTT|L#5dDCHg2fnunow?n3KEhC22?KEL68=sK4>Ym_@K5ky-aJTZ=JsMpP%k-$3E;N
z`SP8!XU|#XnhO|LQ#iBJu=Nmn**GrUb=)3qU@NJxy%K^$=QVo2@h!Y-S-5JLXj_YL
zj2KkYTtv%Sz=gdAHx))Vw}fssAt0N;O!ncZjJHh-&a%Rkz}%!wxaK+$v@&sY2;ik7
zsPcuqEM69qXskxCyBfyFlT887+8OMvM$s@LLe97rsaLKMhOH^MbU5!7;OSv`ceD`d
zx{^96ElbVzGD28RDAY76YN&`^0F#Q2Kl2_Qj!U@f7tu_IFs^9mWEQY*#+X2qT@%SJ
zje1XGJ@iXZ%z9|W@blc0gY&w9z&7BM{9Z1O?u$k2)Biy!iR0pPB7P>LO#KW78%d~X
zGlK&&DxD@fI)a@P69|z*GJgafE@~<GW=z1Jh7}%*Qp)2ssa7m&=4Z*(sLcPWs^g3R
zNBM*(y6YD4by8<@#n?9u3qH9&-qa9K{EB7yYcVm+HA3QiV=aPyE+OF2mQM1u{{%;c
zCGo<gh(!Up$zU<+d*I^tO-JVT(qW9ZH4L{_n1Gt_2r*QWO5!G*#HqfV?%>z7Egn1u
zp44rp$jOM*K~ck?tjXnBJ1<H~am9r4t%fwq`-40#$+-Dp;i)6beCo!gu|gqj6Dbql
z?B~E(A)w-!#K_@4umG=jP0pP<Wx0tEj5e0|DTW7?6{xX*W%KwVvrEp`O%wOWW%Tk1
z&YU}nipNQvOMLRv<biL9fjpDM`FT{OtgEu7JxZcqNQfe5IfRZCWiammKV<<GZ{WAn
z8fc-oGjEqDv3b{%N{AdPUbgu`4x_RrYt8Xrc_#h>=3{g`X*z>e00000NkvXXu0mjf
DCze;k

literal 0
HcmV?d00001

diff --git a/mods/farming/textures/farming_wheat_2.png b/mods/farming/textures/farming_wheat_2.png
new file mode 100755
index 0000000000000000000000000000000000000000..63550d1260a334d108bfefd6cea3a0d431640255
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#E~_XnlMo9FuP9I`!qdeu#G*GjL4tL0f=B|ZFn{}h^{BTCIefORoz3*`@e~*4
zx6w@kSykU!8Z3QZ|M{o<*>OQOd(+*0rUK{Q-IVPzU`R`TAJ>uaU9UwgrR@2)1dHlR
c6FdGh{9CVM&dB$y4QL00r>mdKI;Vst0J-Ek?f?J)

literal 0
HcmV?d00001

diff --git a/mods/farming/textures/farming_wheat_3.png b/mods/farming/textures/farming_wheat_3.png
new file mode 100755
index 0000000000000000000000000000000000000000..00a8c661d1097c7ac19f69cfb45d30465b30b763
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#E~_XnlW;M!Z8K1)+0(@_#Nu>vf&}a02C;-!>n8jcku-Q-pmLGzOD@-e5bM_t
zED;44SI+pK5_xUErGU<kA3TZ7Rp!6`A2-PTbuYlcHaT7*W>fK2{W-Ro)dq8TgSpv)
z%bZl6$#yec=I(R<e_U*XF~0&2+v`Tl%5MufM3^7w-4gyLzl`lBtM|EM|JWsY7`9yW
Vzb<+2LmtpM44$rjF6*2UngEq1OPK%w

literal 0
HcmV?d00001