Merge and resolve conflict on APplication.cpp

Sam Gateau committed 12 years ago

Commit 7ccb7492 parents 631ed9d e562f3d15 files · +58 −34Browse files

Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all

Unified · Split

@@ -108,8 +108,8 @@ static unsigned STARFIELD_SEED = 1; · 107 unmodified lines
108	108
109	109	static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
110	110
111		−//const unsigned MAXIMUM_CACHE_SIZE = 10737418240; // 10GB
112		−const quint64 MAXIMUM_CACHE_SIZE = 10737418240L; // 10GB
	111	+
	112	+const qint64 MAXIMUM_CACHE_SIZE = 10737418240; // 10GB
113	113
114	114	static QTimer* idleTimer = NULL;
115	115

Keyboard shortcuts