Merge branch 'origin/next'

Browse Source

Conflicts:
	companion/src/CMakeLists.txt
	companion/src/apppreferencesdialog.ui
	companion/src/companion.qrc
	companion/src/mdichild.cpp

...

This commit is contained in:

Kjell Kernen

2014-03-31 10:22:23 +02:00

parent abbb9aac08 7d5b876e27

commit 8059daccaf

236 changed files with 25514 additions and 16461 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

companion/src/mdichild.cpp

+728 -720

File diff suppressed because it is too large Load Diff