jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-21 09:05:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix Conflicts

Browse source
This commit is contained in:
Jeff 2015-08-20 22:27:46 -04:00
parent e9bad2cacb
commit 05f2bc8392
3 changed files with 5 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/CMakeLists.txt
View file

@ -94,13 +94,10 @@ SET(cockatrice_SOURCES
src/qt-json/json.cpp
src/soundengine.cpp
src/pending_command.cpp
<<<<<<< HEAD
src/lineeditcompleter.cpp
=======
src/shortcutssettings.cpp
src/sequenceEdit/sequenceedit.cpp
src/sequenceEdit/shortcutstab.cpp
>>>>>>> master
src/lineeditcompleter.cpp
${VERSION_STRING_CPP}
)