-
Kevin Nicholas authored
Conflicts: source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.cpp source/RobotAPI/libraries/CMakeLists.txt source/RobotAPI/libraries/RTRobotUnit/BasicControllers.cpp source/RobotAPI/libraries/RTRobotUnit/BasicControllers.h
Kevin Nicholas authoredConflicts: source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.cpp source/RobotAPI/libraries/CMakeLists.txt source/RobotAPI/libraries/RTRobotUnit/BasicControllers.cpp source/RobotAPI/libraries/RTRobotUnit/BasicControllers.h
.gitignore 729 B
/build/*
!/build/.gitkeep
!.gitkeep
!.gitignore
source/*/Test.h
*.bak
*#
.#*
*~
*.swp
.*.kate-swp
.*.swo
*.pyc
.DS_Store
CMakeFiles
CMakeCache.txt
CMakeLists.txt.user*
*.autosave
*.orig
*.o
*.os
*.a
*.la
*.lo
*.so
*.dylib
moc_*
# eclipse stuff
.project
.pydevproject
.settings
.metadata
.cproject
.project
# clion stuff
/.idea
# MemoryX
.cache
mongod.log*
data/db/
data/dbdump/
# Generated Scenario Files
scenarios/*/startScenario.sh
scenarios/*/stopScenario.sh
scenarios/*/ttyACM*.js
scenarios/*/ttyACM*.log
scenarios/*/config/datapath.cfg
scenarios/*/*/startScenario.sh
scenarios/*/*/stopScenario.sh
scenarios/*/*/ttyACM*.js
scenarios/*/*/ttyACM*.log
scenarios/*/*/config/datapath.cfg
*.icegrid.xml
data/RobotAPI/logs