mirror of
https://gitee.com/spark-store-project/spark-store
synced 2025-10-04 09:32:21 +08:00
100 lines
1.2 KiB
Plaintext
100 lines
1.2 KiB
Plaintext
<<<<<<< HEAD
|
|
=======
|
|
build
|
|
.vscode
|
|
.cache
|
|
CMakeLists.txt.user
|
|
CMakeLists.txt.user.*
|
|
obj-x86_64-linux-gnu
|
|
>>>>>>> update-tool/dev
|
|
# C++ objects and libs
|
|
*.slo
|
|
*.lo
|
|
*.o
|
|
*.a
|
|
*.la
|
|
*.lai
|
|
*.so
|
|
<<<<<<< HEAD
|
|
*.so.*
|
|
=======
|
|
>>>>>>> update-tool/dev
|
|
*.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-*
|
|
<<<<<<< HEAD
|
|
*.qm
|
|
*.prl
|
|
=======
|
|
>>>>>>> update-tool/dev
|
|
|
|
# Qt unit tests
|
|
target_wrapper.*
|
|
|
|
<<<<<<< HEAD
|
|
=======
|
|
# Qt qm files
|
|
translations/*.qm
|
|
|
|
>>>>>>> update-tool/dev
|
|
# QtCreator
|
|
*.autosave
|
|
|
|
# QtCreator Qml
|
|
*.qmlproject.user
|
|
*.qmlproject.user.*
|
|
|
|
# QtCreator CMake
|
|
CMakeLists.txt.user*
|
|
<<<<<<< HEAD
|
|
|
|
# QtCreator 4.8< compilation database
|
|
compile_commands.json
|
|
|
|
# QtCreator local machine specific files for imported projects
|
|
*creator.user*
|
|
|
|
*_qmlcache.qrc
|
|
|
|
# debian
|
|
debian/*.debhelper*
|
|
debian/files
|
|
debian/*.substvars
|
|
debian/spark-store
|
|
|
|
# Others
|
|
build
|
|
obj-*
|
|
.vscode
|
|
=======
|
|
build
|
|
|
|
# Debian dpkg-buildpackage
|
|
debian/*.debhelper*
|
|
debian/files
|
|
debian/*.substvars
|
|
debian/spark-update-tool
|
|
|
|
.vscode/*
|
|
src/spark-update-tool
|
|
>>>>>>> update-tool/dev
|