Retirando arquivos conflitantes

Retirando do repositório 5x5 os arquivos gerados pelo Makefile, conflitantes em push, commit e afins, atualizando também o .gitignore
Red-Dragons-UFSCar · Dec 10, 2021 · 123ac8d · 123ac8d
1 parent e7a851e
commit 123ac8d
Show file tree

Hide file tree

Showing 36 changed files with 67 additions and 10,562 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,72 @@
-*build/
-*__pycache__/**
+build/
+__pycache__/
 *.so
-*include/**
+include/
 *.pyc
 *.stash
 Makefile
 *.o
+
+# Tentativa mais completa
+
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.so.*
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+*.qm
+*.prl
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+
+# QtCreator 4.8< compilation database 
+compile_commands.json
+
+# QtCreator local machine specific files for imported projects
+*creator.user*
+
+# Protobuf 
+*.pb.h
+*.pb.cc
+
+# Folders
+build/
+bin/
+__pycache__
diff --git a/__pycache__/action.cpython-38.pyc b/__pycache__/action.cpython-38.pyc
diff --git a/__pycache__/behaviours.cpython-38.pyc b/__pycache__/behaviours.cpython-38.pyc
diff --git a/__pycache__/bridge.cpython-38.pyc b/__pycache__/bridge.cpython-38.pyc
diff --git a/__pycache__/execution.cpython-38.pyc b/__pycache__/execution.cpython-38.pyc
diff --git a/__pycache__/simClasses.cpython-38.pyc b/__pycache__/simClasses.cpython-38.pyc
diff --git a/build/.qmake.stash b/build/.qmake.stash
diff --git a/build/Makefile b/build/Makefile
diff --git a/build/tmp/obj/actuatorclient.o b/build/tmp/obj/actuatorclient.o
diff --git a/build/tmp/obj/client.o b/build/tmp/obj/client.o
diff --git a/build/tmp/obj/command.pb.o b/build/tmp/obj/command.pb.o
diff --git a/build/tmp/obj/common.pb.o b/build/tmp/obj/common.pb.o
diff --git a/build/tmp/obj/libfira.o b/build/tmp/obj/libfira.o
diff --git a/build/tmp/obj/packet.pb.o b/build/tmp/obj/packet.pb.o
diff --git a/build/tmp/obj/refereeclient.o b/build/tmp/obj/refereeclient.o
diff --git a/build/tmp/obj/replacement.pb.o b/build/tmp/obj/replacement.pb.o
diff --git a/build/tmp/obj/replacerclient.o b/build/tmp/obj/replacerclient.o
diff --git a/build/tmp/obj/visionclient.o b/build/tmp/obj/visionclient.o
diff --git a/build/tmp/obj/vssref_command.pb.o b/build/tmp/obj/vssref_command.pb.o
diff --git a/build/tmp/obj/vssref_common.pb.o b/build/tmp/obj/vssref_common.pb.o
diff --git a/build/tmp/obj/vssref_placement.pb.o b/build/tmp/obj/vssref_placement.pb.o