Merge remote-tracking branch 'refs/remotes/origin/master' into devel

This commit is contained in:
z3APA3A 2016-01-13 01:46:07 +03:00
commit c2d012bf71

View File

@ -1,2 +1,2 @@
#define VERSION "3proxy-0.8b-devel" #define VERSION "3proxy-0.8-pre"
#define BUILDDATE "160107200335" #define BUILDDATE "160113004120"