merging master in client

2 years ago · 980bdb63a7
parent 241358283a 66f90ea81c
commit 980bdb63a7
7 changed files with 7 additions and 1 deletions
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
--- a/BIN
+++ b/BIN
--- a/2
+++ b/2
@ -18,4 +18,4 @@ $(TARGETS): $(SOURCES)

 clean:
 	@rm -r $(BUILD_DIR) $(APP_NAME)
-	@echo -e $(GREEN)clean done.$(RESET)
+	@echo -e $(GREEN)clean done.$(RESET)
--- a/src/app/interface_client.c
+++ b/src/app/interface_client.c
--- a/src/app/interface_client.h
+++ b/src/app/interface_client.h
--- a/src/app/interface_resp.c
+++ b/src/app/interface_resp.c
--- a/src/app/interface_resp.h
+++ b/src/app/interface_resp.h