From b23a18f6fd57e07a38dc0d0ed7ede55df81a4a13 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sun, 15 Feb 2015 14:11:13 +0100 Subject: [PATCH] merge --- .travis.yml | 2 +- .travis/dgtal_rsa.enc | Bin 1680 -> 1680 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 57712f9108..26f3ca91fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: compiler: gcc before_install: - - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d + - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi diff --git a/.travis/dgtal_rsa.enc b/.travis/dgtal_rsa.enc index 3afc3aa35b47868ed3824807d7f7f02dd89847ea..3073af841aca3660dfc6553a9b1c7ef09ec85659 100644 GIT binary patch literal 1680 zcmV;B25JZ&@NxZ0<1n$m` zD^hFF|4@*^ZYiWx7GDU>G5m>u6fIh9x5;%9DJ_Vx2<7V7i)v%uhdBLp!WZ7|v8ObC zejMmI$@S>c!zuZZcU4AXz3091Z8mp3xRS9!cbb$&Oq#m?9=JT}s87Prf0fNs&Dxo2 zPhtNWuLH zaCqa@CFYHzYZ-J_GS(GC{@HivTsUo6yLT^t ztNsFDiaYl2P-~^-uj-x!q-CMQPsv&vv)9G)MtXo#+k)y~on%$kD||`%Z19%(s^m`= z|KLB^3aeM^p)>YEv0Lbs zD4kW&c%w5vQxz9=9HkF_bG;NyJ@dnPZ<#I5(>+#!M=< z){YDY3hEU8uF``>2?-rFkr?Dz^5;40kvx!?=Db#5?qA2E%*z@MD^~mPc{dg2{r30g zbI@}|2h$_t10g9OFYSFV_*JMDKs~Hmz&k9@>yn;>V>NRBMnCK&dlyv8&^~24cG-Gjne$ zMv+3u`LGM=v17I7hWpQVdqk&)`4NI?CK&%LmrOpSc~GJ*{GDq(KHrH9Qq{3$1`p>& zrRCecZi)YbaBH4e`_LIikHRgXY{(*Vo(hD^VQ9@4xQCM|IGVTyV-&qkT>v4m&!IfC{VI%2 zo&%nZZ~-~omuFWg99=O2O!f9J!A`ien7Xvi;sIz>h;2OJ%DnU~*F8s{r}-1C=~Zf& zO=z+pRM)W^{o7Gr6fEB%f_Ha2Mmn2p-Z&mFnhL6veZgWCYG11HL7RQDFT<8`OdUxi z2L$xKyT1WAiF0p2bN>Oi1+){KNOQG6i&ZJ4IK;|sb@+O)5P6hz-)yPT)9*e8an_L@ zt<3zfv~J(Hv&qXQM{gC3tuvsXc(LwuZLwdGVaAX23jDir9x0!g|+2DBi-Eg%X?eZb>Q;#ivS~e z#|p-Nn%c4ou)f-FD>D+hLK-KG5}p+2s$5IV=Pj#()cB@T3B1{%auSemn=+|Qk_)bd zhB=VKBJC^0{(NTe;i}I|!0v2tHFvO;h&P-u0!97S$Y}cAyHS)wrozHAQ6x%o`xM4; zi|T8h9Ju-P62q!Km}i=d-sEG!9m!32rZzwk|edj^|D+T(x a2?PnuIv8=n;-P>P^+;)sDqPn|)%nXa2v95l literal 1680 zcmV;B25`7HyHPg|Sa%ia%fZk`@hWc&!_z#pv-Unr83@s4338}88JipJ-X6|_z_FDD zYDIm@%^I3JL^S2|{4F&#-AEQM~XS)=ows<7ce#x%xw2B8Ov<=@l>=H#`a0pL2xWRxNC5TRW)3CI@gS8?3 z?Hm%Wg2V>%SdKixKN_zIo86n#7mKi6q&`Tkvp)0NLms;Y<_^>hW(gP83F+_K_?6I7 z6rH-4%7L3GN;!k!ot4IX=+k)AjPK#2?D+6cH0W(3iUh>jkPm0)$HepQ*Vbt*?ky=5 zZ~yp0!1laI&wqS$8ohAHmLgcxBL2pViI{x!(dZc%;DAzM6elViXjO4Oq7Y17U zInqcg*SgxVzx=c&~3R5Ts}U6EKmW|FtU)lZ0{(D5;B zWZ6X^hGJ3!x!7P&=@&~(4+z7d>S#@pllenAzo|Cy{ zE;_lq>(|8^HoO13lzs(RDUflTV#1)@Y~^YgGz)Xg!_} zCDqPJp}B}*uP1UCIn+4<>6P52H-hi*vP5^;F0B~Mw1Q-9cB`kG_$uD+W5EgB_s4$2OZduq+GgsVR?!-k*Gzqn`6uiz)%B1k!W_@A#8g z0c;sreSI&VIS#fXi00}4 zsy9J?Btq%YoK&{+@x6GmO`wnWEmGhY@@qFQkqrb+=!}M@*rOyZitK9QXo`-)3Q-LF z)B?I`Yw{X#l1aj_griePtG`t)b(4tU!X|?-divZ_#nz;HA>K`=&)!cm)Lzfw$UIFv z8R6C>#|zqw|Hy^g-1X&ssqo&;wu-t046`=O80IP<$r z5iwmy!gB6+MRp3dSoqotvM!n4w*2o8Z{%y;r<3_w2b5e<%r8FT?b@_hcQU`ohaTMS zd;dV)T5-s1SXve>d%>BWk0g6H0xsA2Dy7G7@Kb=HD5u5(z3r_RlXJm}a_4yVo|BsG z(en+RC7->#bo%CWY}s(^VFb$3X@RWO(9nNdlkgS+K{Hf;iS{$Lyj4jBop;U}ZYjxU zw;yX$`|C z>ZEbx6(H(Kw1O&~-~j}%c03O|eCvNd5zZO^j=SF>87K{;JC|~S?cTk{1tuwUV)!!C zu0yroMejVG$``wpXb2S@r1yM?I09V6Th*qTU`82+u2}?{LOw_O&i{6RS?kdZpOkC2 z-Q8%)WiYb}_(ZvOuFf>;tFf|#UI4Q&1F4u^9w@qP%O65(xS*>L$F_p#Y;;~py+X{I z84)kT!Kds4JWW9hoKDUtyBFNoHI+Ehx++)A{xc_Ju&FQb&AV=qkv#Twov8*-`3oMG aNtoA!ubx9UsEekiiG38Lw5vT=s;+dVu~=aM