Merge ../ldforge into gl

Wed, 12 Mar 2014 16:21:49 +0200

author
Santeri Piippo <crimsondusk64@gmail.com>
date
Wed, 12 Mar 2014 16:21:49 +0200
changeset 705
09150d027e8c
parent 704
d19213bec2f9 (current diff)
parent 654
a74f2ff353b8 (diff)
child 706
d79083b9f74d

Merge ../ldforge into gl

--- a/src/Format.h	Tue Mar 11 16:42:37 2014 +0200
+++ b/src/Format.h	Wed Mar 12 16:21:49 2014 +0200
@@ -35,6 +35,7 @@
 		StringFormatArg (const uchar& a) : m_text (a) {}
 		StringFormatArg (const QChar& a) : m_text (a) {}
 		StringFormatArg (int a) : m_text (QString::number (a)) {}
+		StringFormatArg (long a) : m_text (QString::number (a)) {}
 		StringFormatArg (const float& a) : m_text (QString::number (a)) {}
 		StringFormatArg (const double& a) : m_text (QString::number (a)) {}
 		StringFormatArg (const Vertex& a) : m_text (a.toString (false)) {}
@@ -168,4 +169,4 @@
 	(void) fmtstr;
 	(void) args;
 #endif
-}
\ No newline at end of file
+}

mercurial