Merge branch 'development' of https://github.com/cmderdev/cmder into cmder_exinit

This commit is contained in:
Dax T. Games 2016-02-27 06:41:11 -06:00
commit 4245608e6d
2 changed files with 3 additions and 3 deletions

View File

@ -7,7 +7,7 @@ directly, it has to be hardlinked.
`vendor\aliases.example`. `vendor\aliases.example`.
* `*.lua`: clink completitions and prompt filters; called from vendor\cmder.lua after all * `*.lua`: clink completitions and prompt filters; called from vendor\cmder.lua after all
other prompt filter and clink completitons are initialized; add your own. other prompt filter and clink completitons are initialized; add your own.
* `user_profile.{sh|bat|ps1}: startup files for bash|cmd|powershell tasks; called from their * `user_profile.{sh|bat|ps1}`: startup files for bash|cmd|powershell tasks; called from their
respective startup scripts in `vendor\`; autocreated on first start of such a task respective startup scripts in `vendor\`; autocreated on first start of such a task
* `.history`: the current commandline history; autoupdated on close * `.history`: the current commandline history; autoupdated on close
* `settings`: settings for readline; overwritten on update * `settings`: settings for readline; overwritten on update

4
vendor/sources.json vendored
View File

@ -1,8 +1,8 @@
[ [
{ {
"name": "git-for-windows", "name": "git-for-windows",
"version": "v2.7.1.windows.1", "version": "v2.7.2.windows.1",
"url": "https://github.com/git-for-windows/git/releases/download/v2.7.1.windows.1/PortableGit-2.7.1-32-bit.7z.exe" "url": "https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/PortableGit-2.7.2-32-bit.7z.exe"
}, },
{ {
"name": "clink", "name": "clink",