Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/upx/upx into devel

Browse Source 
Fix Conflicts:
	.github/travis_testsuite_1.sh
This commit is contained in:
John Reiser
2018-08-22 14:58:36 -07:00
parent 98cfe99d65 92a12a2ec1
commit 2923c0968e
5 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util.cpp
+2 -2
View File
@@ -127,12 +127,12 @@ void mem_clear(void *p, size_t n) {
namespace N_BELE_CTP {
const BEPolicy be_policy;
const LEPolicy le_policy;
}
} // namespace N_BELE_CTP
namespace N_BELE_RTP {
const BEPolicy be_policy;
const LEPolicy le_policy;
}
} // namespace N_BELE_RTP
/*************************************************************************
// qsort() util
src/version.h
+3 -3
View File
@@ -1,8 +1,8 @@
#define UPX_VERSION_HEX 0x035f00 /* 03.95.00 */
#define UPX_VERSION_STRING "3.95"
#define UPX_VERSION_STRING4 "3.95"
#define UPX_VERSION_DATE "May 13th 2017"
#define UPX_VERSION_DATE_ISO "2017-05-12"
#define UPX_VERSION_YEAR "2017"
#define UPX_VERSION_DATE "Aug 26th 2018"
#define UPX_VERSION_DATE_ISO "2018-08-26"
#define UPX_VERSION_YEAR "2018"
/* vim:set ts=4 sw=4 et: */