Merge pull request #601 from Stanzilla/bump_conemu

⬆️ ConEmu@150816

README.md

@@ -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)
 

scripts/build.ps1

@@ -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"
@@ -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

vendor/sources.json

@@ -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",