Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ ConEmu@150816 #601

Merged
merged 4 commits into from
Oct 12, 2015
Merged

⬆️ ConEmu@150816 #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df25919
:arrow_up: ConEmu@150816
Stanzilla Aug 19, 2015
24fd027
Update ConEmo project URL
Stanzilla Sep 24, 2015
83c685c
:arrow_up: ConEmu to v15.09.13
Stanzilla Sep 24, 2015
cec7fa3
Merge https://github.com/cmderdev/cmder/commit/eec3fd5578795e87b5e9a9…
Stanzilla Sep 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Latest release is **[v1.2](https://github.com/bliker/cmder/releases/tag/v1.2)**

Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://code.google.com/p/conemu-maximus5/) with *major* config overhaul. Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) and custom prompt layout.
Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul. Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) and custom prompt layout.

![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png)

Expand Down
9 changes: 5 additions & 4 deletions scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ Param(
# Launcher folder location
[string]$launcher = "..\launcher",

# Include git with the package build
[switch]$Full,
# Config folder location
[string]$config = "..\config",

# config folder location
[string]$config = "..\config"
# Include git with the package build
[switch]$Full
)

. "$PSScriptRoot\utils.ps1"
Expand All @@ -74,6 +74,7 @@ if ($config -ne "") {
} else { $ConEmuXml = "" }
} else { $ConEmuXml = "" }


foreach ($s in $sources) {
if($Full -eq $false -and $s.name -eq "msysgit"){
Continue
Expand Down
4 changes: 2 additions & 2 deletions vendor/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
{
"name": "conemu-maximus5",
"version": "150513",
"url": "https://github.com/Maximus5/ConEmu/releases/download/v15.05.13/ConEmuPack.150513.7z"
"version": "150913",
"url": "https://github.com/Maximus5/ConEmu/releases/download/v15.09.13/ConEmuPack.150913.7z"
},
{
"name": "clink-completions",
Expand Down