fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 20:12:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/1.8.7' into develop

Browse source
This commit is contained in:
bnu 2015-07-17 17:36:56 +09:00
commit 89bcdbb844
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Gruntfile.js
View file

@ -299,7 +299,17 @@ module.exports = function(grunt) {
grunt.file.delete('build/xe'); grunt.file.delete('build/xe');
grunt.file.delete('build/temp.full.tar'); grunt.file.delete('build/temp.full.tar');
grunt.log.ok('Done!'); grunt.util.spawn({
cmd: "git",
args: ['diff', '--name-status', target]
}, function (error, result, code) {
var fs = require('fs');
result = 'Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R).' + grunt.util.linefeed + result;
grunt.file.write(build_dir + '/CHANGED.' + version + '.txt', result);
grunt.log.ok('Done!');
});
}); });
}); });
} }

2
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/** /**
* Display XE's full version. * Display XE's full version.
*/ */
define('__XE_VERSION__', '1.8.6'); define('__XE_VERSION__', '1.8.7');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false)); define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false)); define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false)); define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));