Merge branch '1.6.x'

Conflicts:
	src/Client.cpp
	znc-buildmod.in
This commit is contained in:
J-P Nurmi
2015-07-31 23:53:30 +02:00
7 changed files with 22 additions and 9 deletions
+3
View File
@@ -11,6 +11,9 @@
#define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0)
// You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
#ifndef VERSION_EXTRA
# define VERSION_EXTRA ""
#endif
extern const char* ZNC_VERSION_EXTRA;
#endif // !ZNC_VERSION_H