From ccbeb0578a38ab11ced8f4699bfc445e325ab1b4 Mon Sep 17 00:00:00 2001
From: netbenix <netbenix@codenoodles.de>
Date: Sat, 8 May 2021 20:07:59 +0200
Subject: [PATCH 1/4] Updated .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9532f51..7729c1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,6 @@ show_dir.o
 change_dir.o
 update_check.o
 man.o
+calc.o
 math.o
 your-reality.o
\ No newline at end of file

From 7c4e266424fa228e9a34e6a7a22b86f694f06422 Mon Sep 17 00:00:00 2001
From: netbenix <netbenix@codenoodles.de>
Date: Sat, 8 May 2021 20:08:47 +0200
Subject: [PATCH 2/4] Updated .gitignore

---
 .gitignore |   2 +-
 calc.o     | Bin 3688 -> 0 bytes
 math.o     | Bin 2328 -> 0 bytes
 math_ext.o | Bin 2328 -> 0 bytes
 4 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 calc.o
 delete mode 100644 math.o
 delete mode 100644 math_ext.o

diff --git a/.gitignore b/.gitignore
index 7729c1f..65dfd61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,5 @@ change_dir.o
 update_check.o
 man.o
 calc.o
-math.o
+math_ext.o
 your-reality.o
\ No newline at end of file
diff --git a/calc.o b/calc.o
deleted file mode 100644
index 488b657e97828cb0559f9c1a87b5d5ba449878dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3688
zcmbtXU1(fI6h6C26J3++S}G`!aG^w#YOdL~2#Kw1vfgBoH7WU#BFcJq_ilF0{`KCw
zk`!qIfzmYu_RSX`q(10_`rw1~DQp$|c@Pu?pZX|-#s`1tQVR8)xidGD$!-NbaA)Rx
z=R0R+&Y8J)cf&}|1OovO5`Y)sKocmyUg%&PW5XB>KtKE$9=f}nsQ;4K`ZbbGY<CZj
zpfOQ5TG3`==R6VjsA)64AsLN3iTc-^bAX4xFz$qRoAqy42-417s@-fPwvARc@r*Z>
zdyE;s`$}F&y>-pFmk94-v-236KJY_Agh6zxb;%vYX5;CtR@Cj?YUSO5{lSBY_aoA{
zyRjc=G^7b0ysb{#Wq9Kad7at=6K3qS%gNzH8o#yU{1J|zVcXctg-5>4CBo$<n;b`1
znoJd$rb2t``uCh3S*!6^yScX!-d?8qoM1=6ug{`u+OCz=GG;MTE1GV_)*<eXwK45g
z%XSKtvNo<qLoi>pY||xmB(LQvwwAYw)zL`}hBJ~aldn`9tBkPEceG@|aVND9L^0-6
zHd~-5a2l1xTH3YE4Aak`{z|Rr7OKT{IE%_lg|`b?3!=I<S1YA0o2Dw};IyQNv<1sS
zpGgfZAsEgA%*NxB+Q@RcR(5MzbX-59kB>!bOpT6mfX*L4H$D-3j^Q&qw+ummCShIp
zkeu*32wYx(z*;0Q*w_0|1MBl7;`ETzsWAp3SA+5Xp5P`jJli?KQA}!l`$gaWI^ig@
z)Cl_(W@fS9AsposYJ@%bq3{1b;V4OJe0$srKv)~0qty++-*02WJ(KmQbg}Fl#&L^q
zT;j7FFwD#6VK%@B0+eS}o<pD=ezpVtLI?b1#A!WZ9W3XFz1D%h%K1^gWtL;asvN(K
zJqfD~_8a)LTjv(yH191Qht&cxp!=j}z@h6!_X$$7$@%H2WNLn9X3<zmElo`)jT96s
zD=U@_)tc)-)h?9X9HdeOr;?eNNI4m^oCEJN`4<Vz7&Eh)%H&s5IkQlN`3tEi6!CWX
z90%}%!HVU2cZQZTL=6g_Z+5ot-S^}qL%n;@gJXf8;<(_8y;HqN=#KQ_Blyn~h$8sH
zKgLjxPiIE(=Qu9-ajsvK_zz3`oP>uYobpdX>v;qp5&t@YC?fuhr^2VaC%(MjA0@mG
z$0E)x3GbKizd0`A(>Wu#>vc!+BR=JVU*fzTes0u!_H$hDFLVC!4*Vw+{=1w%)PX;&
z@ZaP7Qyuv83jaFiFLmIj75-<OUzGTAeI14WIp?oQeEGaxRrn%4y_-oWpK|<<BzypE
zqP{njIJ@MG@}<O=&+X3=E}yp`6$(Yv>w8ayK8~yFIVs_C9F6;tnNt`NQ*iN~dsD%0
zbA406#e41p1sCrv(4F;?Yo@VxZLiOZk!=-C-L=+S(6gp%f}VC9(Cvz+WGbbSRYqI6
z;#xX>L&w<riR&xnnqIXl__M)XM<0r0<x@G^ELnUd|F6@~ok~J?S(X@AM&%?T#>?kZ
z2XRETiTQ{(xWEH`+~w(1Bl4xQK=QcP!Bf~1&S@M4C@Av^gF64SXrP$?)jx{96jPl}
z%>NVGWKrjzKqFz}G6~1$`GRPFvIu|CPoq(cWnM<z5I3sa1;puItLx8me~tTzPUK(c
zZ{dJqs{YrwKl{TV$k?m?bPC(mzeO((lr^to-xh*|zo>t^xydC)K~XmOhUuF^km^q{
g+oh^WKS)t_yv}dc{5^`6cK%iRNTRr2=eMf=KT&H_;s5{u

diff --git a/math.o b/math.o
deleted file mode 100644
index 217e530046d31d5665f552a415c44aa69f3c83ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2328
zcmb_c&1=+95T9*pyRB`r6%WOVL<Ol}Ll;3&RMKwKF0!@K53x{Pvu)N@yB}nex~-yu
zAc~hBJ$UfwN&Evmtazz6y?GZwP_VX_qJqvO^LE2)ibWiFnVH{jX7b+5OYRz};f6>A
zghb#B)IEU$JlRpVb<fnH6FOjB+4o~A`RLP{(q(MmV{~;*iIH{DSj{GtJ5_uXs+Znu
z88@@dxaq&eWtDH$tfCpKOI<b7Z6@<e8}I3Ic#Y)!uQA?#%sXcCv9Xa=dRM%?f2Pyc
zkMg#5lx?Kpdpjt7O__cjEI}AaRPXK^n*6!HRfmy8;-uO;m2nG>tH%4aqgsDo-1Xe}
zVFoax30Djk?Q`VZ6f^)-32VefvfEb>SsI5(B^K#vZ;3ABK=&d}i=>wxMrZ6nL!zTO
zjREKqcZzV7t@s(A-jct~{19nT|5m;JQ|6Bc`9ht4#e5>jFZn!En-tyECiwn)6M;Zu
z=uIX(aG5!gdax@H@AUw&cE*J-G|hnG&!Z+0IQ5_KiiZMty+FI0adAek2Z$ZSMYUu(
zfj}638gZ(>&Iw+x$j+NiPMd{+xjC3{GcfAT!_c(_NVpm6LUG>BTaX?}jSUW@(qqHJ
z6UJnEa$qoJq@h&22@|E9Ws5Ms@O!S0_shFmzkd7jk#V|nZMXy;<)4NezlU)-{(uxu
zJc;T(f$p`p*acm}MZd2|xR}R12^aHtCgEZpRS6gU1+Bc8cgzfG$M$tjShh89YK~QL
zK$|li6SPdZ44Pf^o!MeOZxxU$6dg;$Z?&)Nn6o$7zglp$l3grWwzG&iRLRPvv$lzY
z`X8cV5o&R>R7_|8824Y$k_$aZ&`fj@z`C0UCHlD&amtMfp7kNd8`&3XL4FYvGJFJa
zs`;<^am=NfbdQ2k;TOr@me{|DrSFeI`vt)IA?MTig2J$uL--&rfd%7Ugn=Qk<A}B3
zlK20T^Ht=6BJck?k`yZEzvKK5!DO`Me7c2U^IzuqFLOT4zcr9g|2dMdcN6}cH>C1D
o=>JM3#rs7*)s$zC5UenGmYjfaxf;@iR#?8uzka6{=^JwXAL6DVfdBvi

diff --git a/math_ext.o b/math_ext.o
deleted file mode 100644
index 62828c7bc5137b4e74d99be84f631ad017ac0955..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2328
zcmb_c&1(};5TCR)O>5gt#Y3<~Ru5XiE)9aBsBD^Un?u@4Kg2>cChf+k%?F#^npROk
z5XDQ69z1yTB>n*&B3|lEZ{9@^6s+x~s8DA%^OEIti$xrGJM(_OnR)NcynXkK<Zx3U
z073$A9vU-&0zBQ*uyxnep$j@;Lpk_!I`R1Py3%cI;%9ViT?vzQ$ym!Kl)F{@6snis
z?&vqWOTU@F`DK;w)vTf!Ys=kr(+QIKwVn5L#Xm>l!M8B)KkObe@x<87Dt)W&-oMak
z8%KFpKguq`aNSM{Usq<{cvBEY64E36LsP#FwdpVtkDpQdrZY~#cGT#Ac0wEIk2>x&
zdW->#Xu%Q2LHisTn}#NUDq+nyNcPth1ePZtPzeWmI$A?3*w9|YX^`~M$LI<_Y>IaV
zQ|N$G;?5F|vJ*dBqj%)*Fh4|E<iFj>|BU%lUcS)aUo#)~^2;@zscnkxY76|>+D0JI
z?0b_5_grQU>_ENG<L}l0F{(A;VlFh*neYp!Ndz82oA8Q@0=Tt6yO(isMz;ot9mPRw
z$Z`$=KRkvw<=@}{w^n55({?UpR%~q!V)OGb>11HkS%9JIix77*=EdTIlQ$tXk{ln5
zB~#<W!;{8TYAQCEG*VD1-h#<e&a{LZzz5Ec_shLozqe}giE+Af?KlJ;;zvXFKft)`
ze^~M-o<w!OK=;}mJOy3CMZK>|xah}y2^al%F5#jdRS6gM1+Bc4x6>KawpG(PVOi!v
zTC=g{pv|Z4G-#P}88oX{o6HsSd9#3Ap=g^L{;U0EJ3V)k=hq63R<epE)3TQ^hBBGC
zRMtvklm3UOn1o6kl#=N@KgsnMv^0etB&a94a9|zbMu~dvMVw+of@gh%aq%uO42$wY
zOvvzY#3|>$#z!%ha?(BWN`)7a|1Gh9;d>elavcx=>qi_<=kp4~ZVcgrI0WYPd+7)I
z_)Z|!ibLN2D~?x@^NPIx8%UC?9RHr<KYD}FmgDIb`t^T>`@h2R)c-b5e1vhowTXJc
s8&Y{6^zKqhvA&3>oO16Gf>j2`XyOr0S4X<h@{3pb>9^~iHA9a712Lx~RR910


From 5d2c46afd037bebe59990e0bf7cafd92e91000c6 Mon Sep 17 00:00:00 2001
From: netbenix <netbenix@codenoodles.de>
Date: Sat, 8 May 2021 20:11:20 +0200
Subject: [PATCH 3/4] Update makefile

---
 makefile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/makefile b/makefile
index aad32f6..28d38d9 100644
--- a/makefile
+++ b/makefile
@@ -2,11 +2,7 @@ CC= gcc
 ARGS= -export-dynamic -ansi -std=gnu99
 CFLAGS= $(shell pkg-config --cflags gtk+-3.0) -I/usr/include/mysql
 LDLIBS= $(shell pkg-config --libs gtk+-3.0) -L/usr/lib/mysql -lmysqlclient
-<<<<<<< HEAD
-OBJ= main.o logo.o logger.o help.o sys_info.o gtk_test.o sql_test.o show_dir.o change_dir.o update_check.o man.o your-reality.o math.o
-=======
-OBJ= main.o logo.o logger.o help.o sys_info.o gtk_test.o sql_test.o show_dir.o change_dir.o update_check.o man.o your-reality.o
->>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
+OBJ= main.o logo.o logger.o help.o sys_info.o gtk_test.o sql_test.o show_dir.o change_dir.o update_check.o man.o your-reality.o math_ext.o calc.o
 
 netbenixCMD: $(OBJ)
 	$(CC) $(CFLAGS) $(ARGS) -o netbenixCMD $(OBJ) $(LDLIBS)
@@ -32,10 +28,9 @@ update_check.o: utils/update_check.c
 	$(CC) $(CFLAGS) -c utils/update_check.c
 man.o: etc/man.c
 	$(CC) $(CFLAGS) -c etc/man.c
-<<<<<<< HEAD
-math.o: etc/math.c
-	$(CC) $(CFLAGS) -c etc/math.c
-=======
->>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
+math.o: etc/math_ext.c
+	$(CC) $(CFLAGS) -c etc/math_ext.c
 your-reality.o: etc/your-reality.c
-	$(CC) $(CFLAGS) -c etc/your-reality.c
\ No newline at end of file
+	$(CC) $(CFLAGS) -c etc/your-reality.c
+calc.o: utils/calc.c
+	$(CC) $(CFLAGS) -c utils/calc.c
\ No newline at end of file

From 8b5909e2b1ed1a87773dd9f3fb75de8737a39291 Mon Sep 17 00:00:00 2001
From: netbenix <netbenix@codenoodles.de>
Date: Mon, 21 Jun 2021 11:50:50 +0200
Subject: [PATCH 4/4] Inital commit

---
 clear_screen.o | Bin 0 -> 1624 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 clear_screen.o

diff --git a/clear_screen.o b/clear_screen.o
new file mode 100644
index 0000000000000000000000000000000000000000..28f1ac544e3e471ef1f17bfb13ce069fe81b0817
GIT binary patch
literal 1624
zcmbtT&1(};5T8xc){nM{ABRFk_M%j@k3=upgQN{FStMAr$x)WgX4}-}i_HtPB6uhW
zp$PpmJbJ4q8}uOl1L8lR2<8y+5=5voyYHpj?e?NSn4Ov5yqS4#-rE<vkc(*=C}?mW
zjy%Nz%#Iz|8PCkXG)%#-#MR#=qx;p^>FX6^H-2p%gGQGR(>>!A9~j;D?=BSq4yfi^
z%KJ{AkGxOn$IQVwR35d%`&we34-)&md%XYr+n%w@hZW<dUr~&Ei#~mTd^WqN&zH)b
zhUn<&6uZMx3+ayMrf*0BYsOKMDB~#khb4#s^oUc(xQsSId-fQ#t)w<LHF;(aH+cm)
z5<-hUd?xuamYtr6t>X$JqCw}2!_UL0=vc%=X>S(;yw?jk>P@jQZX*%J-#vxToWg@$
zb1c_v+pgm@nC-i(o(E>Wu(G^VFjsQ9RbDiUOUngr!bZ~;HE4B&UA0^=&9<=YP1CM!
znrqfZ4cmC2{Sj!!H1j`)J~)vG;wMlP|CC4s@slWu*U={6eR<+J^kMDoy0FTqh3o68
zvRtQTG2v_pU=>SPz{>45FuPf=I}PL-P2n(n0}I~HrN7?ju$J3wIj-0S=2dX2=9+8O
zol(pGF?39(H$i6(A|oAj-zr9HgP22yW|Ik$Xd5&b(!K)ve<)Wy%~{D`m%MuKl7=_R
z2<dSDTNtOB|C*o1T&kHu2}1R!{RN@=E4_$8We3-N4mtrly!HXc=v~QijaGh<mOf&9
zL(NaoWi+T}IDaS?(0><1IR6O-qwa4{7F72{_eZ%ZU-41Bsb5MSv_}r&JPO@WIRC8V
hQ60lT=07^do}BdsjEC=@QeMmbkA8evN0yZyz+cU`qH_QM

literal 0
HcmV?d00001