Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Repository
2101ed7096518df6434a39a68668ab7076061598
Switch branch/tag
Cockatrice
cockatrice
src
dlg_settings.h
Find file
Blame
History
Permalink
Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt
· 2101ed70
Fabio Bas
authored
Jan 05, 2015
Conflicts: cockatrice/src/dlg_settings.cpp cockatrice/src/dlg_settings.h
2101ed70
