Huijue-Network
/
emsApplication
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Huijue-Network:bce2956dae20109467a3385b24f36983f0e31914
Branches Tags
Huijue-Network:main
...
compare: Huijue-Network:5b71d4c4653038184b8bf26e56865db068db5082
Branches Tags
Huijue-Network:main

3 Commits
bce2956dae ... 5b71d4c465

Author SHA1 Message Date
HwangKC 5b71d4c465 sss 2024-09-14 22:54:17 +08:00
HwangKC 0a14ee1735 Merge branch 'main' of http://116.236.50.103:8789/Huijue-Network/emsApplication 
# Conflicts:
#	.gitignore
 2024-09-14 22:53:36 +08:00
HwangKC 17e4d63794 s 2024-09-14 22:51:46 +08:00
1 changed files with 6 additions and 0 deletions
Show Stats Expand all files Collapse all files

6
.gitignore vendored
View File

@ -3,5 +3,11 @@
/appRelease/test.release /appRelease/test.release
/sdk/include/SQLiteCpp /sdk/include/SQLiteCpp
/appRelease/mysql/mysql-arm.tar /appRelease/mysql/mysql-arm.tar
<<<<<<< HEAD
/applications/examples/jsondemo2/x64
/applications/examples/jsondemo2/jsondemo2.vcxproj.filters
/applications/examples/jsondemo2/jsondemo2.vcxproj.user
=======
/applications/ems_datahubs/.vs /applications/ems_datahubs/.vs
/applications/ems_datahubs/obj /applications/ems_datahubs/obj
>>>>>>> bce2956dae20109467a3385b24f36983f0e31914