Merge remote-tracking branch 'check/next-cc'

Browse Source

compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp

...

This commit is contained in:

Stefan Seyfried

2014-01-23 14:08:37 +01:00

parent 7d3843847a 3ad7175c45

commit b414474323

92 changed files with 2474 additions and 1428 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

668

src/gui/widget/menue.cpp

File diff suppressed because it is too large Load Diff