xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-19 11:49:42 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'renlixin'

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
xin
2022-05-06 10:17:37 +08:00
parent a0b93df2f7 de2feb9fe0
commit 54e89bb81f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,5 +1,5 @@
################################################################################ ################################################################################
# 此 .gitignore 文件已由 Micosoft(R) Visual Studio 自动创建。 # 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
################################################################################ ################################################################################
/build /build
@ -16,4 +16,3 @@
/othersoft/calibration_console/build/ /othersoft/calibration_console/build/
/othersoft/shuttercali/project/LocationCali/cmake-build-debug /othersoft/shuttercali/project/LocationCali/cmake-build-debug
/othersoft/calibration_console/cmake-build-debug/ /othersoft/calibration_console/cmake-build-debug/
/othersoft/calibration_console/cmake-build-debug/