Merge branch 'master' of https://github.com/bliker/cmder into development

Merge branch 'master' into development
Merge pull request #125 from saaguero/patch-1
2025-07-17 04:59:09 +08:00 · 2014-01-31 17:32:48 +01:00 · 2014-01-31 17:31:25 +01:00 · 2014-01-31 08:27:58 -08:00 · 2014-01-31 08:27:01 -08:00 · 2014-01-31 17:22:08 +01:00
15 changed files with 152 additions and 40 deletions
--- a/Cmder.bat
+++ b/Cmder.bat
@ -0,0 +1,3 @@
+@echo off
+SET CMDER_ROOT=%~dp0
+start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
--- a/Readme.md
+++ b/Readme.md
@ -1,6 +1,6 @@
 # Cmder

-**Yes, you can [download latest release](https://github.com/bliker/cmder/releases)**
+Latest release is **[v1.1.3](https://github.com/bliker/cmder/releases/tag/v1.1.3)**

 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://code.google.com/p/clink/) and custom prompt layout.

@ -8,7 +8,7 @@ Cmder is a **software package** created out of pure frustration over absence of

 ## Why use it

-The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies. That makes it great for **USB Sticks** or **Dropbox**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere.
+The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies, that is makes it great for **USB Sticks** or **Dropbox**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere.

 ## Installation

@ -26,7 +26,7 @@ The main advantage of Cmder is portability. It is designed to be totally self-co
 * `Ctrl + t` : new tab dialog (maybe you want to open cmd as admin?)
 * `Ctrl + w` : close tab
 * `Ctrl + d` : close tab (if pressed on empty command)
-* `Ctrl + alt + number` : fast new tab: `1` - CMD, `2` - Powershell `*` - More to come
+* `Shift + alt + number` : fast new tab: `1` - CMD, `2` - Powershell `*` - More to come
 * `Alt + enter`: Fullscreen

 ### Shell
@ -49,7 +49,10 @@ All aliases will be saved in `/config/aliases` file

 ## Todo

-1. Write a Todo list
+1. Complete PowerShell compatibility.
+2. Workaround git.exe overload after msysgit download (Granted this is an upstream issue).
+3. Redo Build/Pack scripts or remove them altogether.
+4. Launcher XP compatibility.

 ## License

--- a/bin/Readme.md
+++ b/bin/Readme.md
@ -1,3 +1,3 @@
 ## Bin

-This folder will be injected into path at runtime
+This folder will be injected into the PATH environment variable at runtime.
--- a/build.rb
+++ b/build.rb
@ -98,11 +98,26 @@ get_file('msysgit', 'label:Type-Archive label:Featured')

 puts 'Creating executable'

+puts 'Build for XP? (Default: No)'
+if gets.downcase =='yes' or 'y'
+    XP = true
+elsif gets.downcase == 'no' or 'n'
+    XP = false
+else
+    puts 'Defaulting to non-XP build'
+    XP = false
+end
+
 if build_exe
    Dir.chdir('../launcher')
-    status = system('msbuild /p:Configuration=Release')
+    if XP
+        puts 'Building XP Compatible Launcher...'
+        status = system('msbuild /p:Configuration=ReleaseXP')
+    else
+        status = system('msbuild /p:Configuration=Release')
+    end
    unless status
-        puts 'Looks like the build failied'
+        puts 'Looks like the build failed'
        exit(1)
    end
 end
--- a/config/ConEmu.xml
+++ b/config/ConEmu.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <key name="Software">
 	<key name="ConEmu">
-		<key name=".Vanilla" modified="2013-11-29 16:19:40" build="131107">
+		<key name=".Vanilla" modified="2014-01-21 18:36:36" build="131215">
 			<value name="ColorTable00" type="dword" data="00222827"/>
 			<value name="ColorTable01" type="dword" data="009e5401"/>
 			<value name="ColorTable02" type="dword" data="0004aa74"/>
@ -18,21 +18,21 @@
 			<value name="ColorTable13" type="dword" data="00b87da8"/>
 			<value name="ColorTable14" type="dword" data="0081cccc"/>
 			<value name="ColorTable15" type="dword" data="00ffffff"/>
-			<value name="ColorTable16" type="dword" data="00000000"/>
-			<value name="ColorTable17" type="dword" data="00800000"/>
-			<value name="ColorTable18" type="dword" data="00008000"/>
-			<value name="ColorTable19" type="dword" data="00808000"/>
-			<value name="ColorTable20" type="dword" data="00000080"/>
-			<value name="ColorTable21" type="dword" data="00800080"/>
-			<value name="ColorTable22" type="dword" data="00008080"/>
-			<value name="ColorTable23" type="dword" data="00c0c0c0"/>
-			<value name="ColorTable24" type="dword" data="00808080"/>
-			<value name="ColorTable25" type="dword" data="00ff0000"/>
-			<value name="ColorTable26" type="dword" data="0000ff00"/>
-			<value name="ColorTable27" type="dword" data="00ffff00"/>
-			<value name="ColorTable28" type="dword" data="000000ff"/>
-			<value name="ColorTable29" type="dword" data="00ff00ff"/>
-			<value name="ColorTable30" type="dword" data="0000ffff"/>
+			<value name="ColorTable16" type="dword" data="00222827"/>
+			<value name="ColorTable17" type="dword" data="009e5401"/>
+			<value name="ColorTable18" type="dword" data="0004aa74"/>
+			<value name="ColorTable19" type="dword" data="00a6831a"/>
+			<value name="ColorTable20" type="dword" data="003403a7"/>
+			<value name="ColorTable21" type="dword" data="009c5689"/>
+			<value name="ColorTable22" type="dword" data="0049b6b6"/>
+			<value name="ColorTable23" type="dword" data="00cacaca"/>
+			<value name="ColorTable24" type="dword" data="007c7c7c"/>
+			<value name="ColorTable25" type="dword" data="00f58303"/>
+			<value name="ColorTable26" type="dword" data="0006d08d"/>
+			<value name="ColorTable27" type="dword" data="00e5c258"/>
+			<value name="ColorTable28" type="dword" data="004b04f3"/>
+			<value name="ColorTable29" type="dword" data="00b87da8"/>
+			<value name="ColorTable30" type="dword" data="0081cccc"/>
 			<value name="ColorTable31" type="dword" data="00ffffff"/>
 			<value name="ExtendColors" type="hex" data="00"/>
 			<value name="ExtendColorIdx" type="hex" data="0e"/>
@ -53,7 +53,7 @@
 			<value name="ClipboardArrowStart" type="hex" data="00"/>
 			<value name="ClipboardAllLines" type="hex" data="01"/>
 			<value name="ClipboardFirstLine" type="hex" data="01"/>
-			<value name="ClipboardClickPromptPosition" type="hex" data="02"/>
+			<value name="ClipboardClickPromptPosition" type="hex" data="00"/>
 			<value name="ClipboardDeleteLeftWord" type="hex" data="01"/>
 			<value name="TrueColorerSupport" type="hex" data="01"/>
 			<value name="FadeInactive" type="hex" data="01"/>
@ -415,10 +415,10 @@
 			<value name="KeyMacro01.Text" type="string" data="Task(&quot;cmd&quot;)"/>
 			<value name="KeyMacro02" type="dword" data="0012a032"/>
 			<value name="KeyMacro02.Text" type="string" data="Task(&quot;PowerShell&quot;)"/>
-			<value name="KeyMacro03" type="dword" data="00000000"/>
-			<value name="KeyMacro03.Text" type="string" data=""/>
-			<value name="KeyMacro04" type="dword" data="00000000"/>
-			<value name="KeyMacro04.Text" type="string" data=""/>
+			<value name="KeyMacro03" type="dword" data="000011d0"/>
+			<value name="KeyMacro03.Text" type="string" data="FontSetSize(1,2)"/>
+			<value name="KeyMacro04" type="dword" data="000011d1"/>
+			<value name="KeyMacro04.Text" type="string" data="FontSetSize(1,-2)"/>
 			<value name="KeyMacro05" type="dword" data="00000000"/>
 			<value name="KeyMacro05.Text" type="string" data=""/>
 			<value name="KeyMacro06" type="dword" data="00000000"/>
@ -483,17 +483,17 @@
 			<value name="DndLKey" type="hex" data="00"/>
 			<value name="DndRKey" type="hex" data="a2"/>
 			<value name="WndDragKey" type="dword" data="00121101"/>
-				<key name="Tasks" modified="2013-11-29 16:19:41" build="131107">
+				<key name="Tasks" modified="2014-01-21 18:36:36" build="131215">
 				<value name="Count" type="dword" data="00000002"/>
-						<key name="Task1" modified="2013-11-29 16:19:41" build="131107">
+						<key name="Task1" modified="2014-01-21 18:36:36" build="131215">
 					<value name="Name" type="string" data="{cmd}"/>
-					<value name="GuiArgs" type="string" data=" /icon &quot;cmd.exe&quot;"/>
+					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
 					<value name="Cmd1" type="string" data="cmd /k &quot;%CMDER_ROOT%\vendor\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 				</key>
-						<key name="Task2" modified="2013-11-29 16:19:41" build="131107">
+						<key name="Task2" modified="2014-01-21 18:36:36" build="131215">
 					<value name="Name" type="string" data="{PowerShell}"/>
 					<value name="GuiArgs" type="string" data="/dir &quot;%userprofile%&quot;"/>
 					<value name="Cmd1" type="string" data="powershell"/>
@ -502,11 +502,11 @@
 					<value name="Hotkey" type="dword" data="00000000"/>
 				</key>
 			</key>
-				<key name="Apps" modified="2013-11-29 16:19:41" build="131107">
+				<key name="Apps" modified="2014-01-21 18:36:36" build="131215">
 				<value name="Count" type="dword" data="00000000"/>
 			</key>
-				<key name="Colors" modified="2013-11-29 16:19:41" build="131107">
-			<key name="Palette1" modified="2013-11-29 16:19:41" build="131107">
+				<key name="Colors" modified="2014-01-31 17:13:53" build="131107">
+			<key name="Palette1" modified="2014-01-31 17:13:53" build="131107">
 					<value name="Name" type="string" data="Monokai"/>
 					<value name="ExtendColors" type="hex" data="00"/>
 					<value name="ExtendColorIdx" type="hex" data="0e"/>
@ -573,6 +573,14 @@
 			<value name="CTS.VkCopyFmt0" type="dword" data="00001143"/>
 			<value name="CTS.VkCopyFmt1" type="dword" data="00101143"/>
 			<value name="CTS.VkCopyFmt2" type="dword" data="00000000"/>
+			<value name="ProcessNewConArg" type="hex" data="01"/>
+			<value name="HighlightMouseRow" type="hex" data="00"/>
+			<value name="HighlightMouseCol" type="hex" data="00"/>
+			<value name="HighlightMouseSwitch" type="dword" data="00005d4c"/>
+			<value name="TransparencyInc" type="dword" data="00000000"/>
+			<value name="TransparencyDec" type="dword" data="00000000"/>
+			<value name="Key.MaximizeWidth" type="dword" data="00000000"/>
+			<value name="Key.MaximizeHeight" type="dword" data="00000000"/>
 		</key>
 	</key>
 </key>
--- a/config/Readme.md
+++ b/config/Readme.md
@ -1,3 +1,3 @@
 ## Config

-All config files must be in this folder, if there is no option to set the folder directly, it has to be hardlinked.
+All config files must be in this folder. If there is no option to set this folder directly, it has to be hardlinked.
--- a/config/aliases
+++ b/config/aliases
@ -2,3 +2,4 @@ e.=explorer .
 gl=git log --oneline --all --graph --decorate  $*
 ls=ls --color $*
 pwd=cd
+clear=cls
--- a/launcher/CmderLauncher.sln
+++ b/launcher/CmderLauncher.sln
@ -1,6 +1,6 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio Express 2013 for Windows Desktop
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmderLauncher", "CmderLauncher.vcxproj", "{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}"
@ -8,13 +8,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		DebugXP|Win32 = DebugXP|Win32
 		Release|Win32 = Release|Win32
+		ReleaseXP|Win32 = ReleaseXP|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.Build.0 = Debug|Win32
+		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.DebugXP|Win32.ActiveCfg = DebugXP|Win32
+		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.DebugXP|Win32.Build.0 = DebugXP|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.ActiveCfg = Release|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.Build.0 = Release|Win32
+		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
+		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/launcher/CmderLauncher.vcxproj
+++ b/launcher/CmderLauncher.vcxproj
@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugXP|Win32">
+      <Configuration>DebugXP</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseXP|Win32">
+      <Configuration>ReleaseXP</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@ -22,6 +30,12 @@
    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
@ -29,24 +43,45 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
    <TargetName>Cmder</TargetName>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>Cmder</TargetName>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>Cmder</TargetName>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>Cmder</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <PrecompiledHeader>
@ -61,6 +96,20 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@ -83,6 +132,28 @@
      <Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ResourceCompile Include="src\Resource.rc" />
  </ItemGroup>
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@ -192,8 +192,13 @@ void UnregisterShellMenu(std::wstring opt)
 	FAIL_ON_ERROR(
 		RegCreateKeyEx(root, SHELL_MENU_REGISTRY_PATH, 0, NULL,
 		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
+#ifdef XP
+	FAIL_ON_ERROR(SHDeleteKey(cmderKey, NULL));
+	FAIL_ON_ERROR(SHDeleteKey(root, SHELL_MENU_REGISTRY_PATH));
+#else
 	FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL));
 	FAIL_ON_ERROR(RegDeleteKey(root, SHELL_MENU_REGISTRY_PATH));
+#endif
 	RegCloseKey(cmderKey);
 	RegCloseKey(root);
 }
--- a/msvcp120.dll
+++ b/msvcp120.dll
--- a/msvcr120.dll
+++ b/msvcr120.dll
--- a/pack.rb
+++ b/pack.rb
@ -27,7 +27,7 @@ end
 version = `git describe --abbrev=0 --tags`

 FileUtils.touch('Version ' + version.chomp)
-FileUtils.rm('config/.history')
+FileUtils.rm('config/.history') if File.exists?('config/.history')

 Dir.chdir('..')

--- a/vendor/Readme.md
+++ b/vendor/Readme.md
@ -1,3 +1,3 @@
 ## Vendor

-Software from third parties + init sctipt
+Third parties software & init script.
--- a/vendor/init.bat
+++ b/vendor/init.bat
@ -24,7 +24,7 @@

 :: Enhance Path
@set git_install_root=%CMDER_ROOT%\vendor\msysgit
-@set PATH=%PATH%;%CMDER_ROOT%\bin;%git_install_root%\bin;%git_install_root%\mingw\bin;%git_install_root%\cmd;%git_install_root%\share\vim\vim73;
+@set PATH=%CMDER_ROOT%\bin;%git_install_root%\bin;%git_install_root%\mingw\bin;%git_install_root%\cmd;%git_install_root%\share\vim\vim73;%PATH%

 :: Add aliases
@doskey /macrofile="%CMDER_ROOT%\config\aliases"
Author	SHA1	Message	Date
Samuel Vasko	1108d7ca1f	Merge branch 'master' of https://github.com/bliker/cmder into development	2014-01-31 17:32:48 +01:00
Samuel Vasko	000a3e40e0	Merge branch 'master' into development	2014-01-31 17:31:25 +01:00
Samuel Vasko	0f118fe42d	Merge pull request #125 from saaguero/patch-1 Ability to change Font Size using Ctrl+MouseWheel	2014-01-31 08:27:58 -08:00
Samuel Vasko	f719f9d51f	Merge pull request #98 from jcheng31/patch-1 Update fast new tab shortcut in README.	2014-01-31 08:27:01 -08:00
Samuel Vasko	bf882f1dc1	Reordered the PATH, closing #37 Now the msysgit is being loaded first, so find will invoke the correct and better version	2014-01-31 17:22:08 +01:00
Samuel Vasko	8e0afaf846	Color scheme from upstream Before the monokai in the Conemu was different and not matching colors correctly. Now that was fixed so no need to keep ours.	2014-01-31 17:16:29 +01:00
Martin Kemp	f8850b1344	Merge branch 'xplauncher' into development	2014-01-29 23:44:33 +00:00
Santiago Agüero	86d77b9e6b	Ability to change Font Size using Ctrl+MouseWheel	2014-01-28 18:10:15 -02:00
Martin Kemp	937df38131	Todo list & bonus alias Added todo list and added an alias.	2014-01-21 23:48:41 +00:00
Martin Kemp	6b2d288fbd	Disable left click cursor change by default Fixes #109	2014-01-21 19:40:05 +00:00
Martin Kemp	8303a7acbc	XP compatible launcher Building will have to be sorted but it's a start, please test as I don't have an XP machine anymore.	2014-01-21 18:25:24 +00:00
Samuel Vasko	4120875e33	bump version	2014-01-02 21:23:40 +01:00
Samuel Vasko	c91f8ac461	Conditional delete	2013-12-31 16:12:12 +01:00
Samuel Vasko	c43ad3cb40	Cleanup of the cleanup file Moved the cleanup to another branch	2013-12-31 15:51:03 +01:00
Jerome Cheng	e0540e43da	Update new tab shortcut in README.	2013-12-26 16:11:11 +08:00
Samuel Vasko	cfa0bc9a26	Merge branch 'master' of https://github.com/bliker/cmder	2013-12-24 20:45:56 +01:00
Samuel Vasko	4ac8f5ad82	keep the launcher for winxp	2013-12-24 20:45:43 +01:00
Samuel Vasko	640bdba8bb	Merge pull request #88 from sc0tt/master Make cmd use Cmder icon	2013-12-24 11:42:45 -08:00
Samuel Vasko	88e17fc44a	Adding .dlls to git for now	2013-12-24 14:41:36 +01:00
Samuel Vasko	67bdd93c3e	Merge pull request #85 from MartiUK/gitcleanup Git exe Cleanup + some bonuses	2013-12-24 05:38:49 -08:00
Martin Kemp	804126cf7d	Merge pull request #2 from sicil1ano/dev Git directory cleanup ruby script	2013-12-13 10:30:06 -08:00
Scott Adie	94f0ea5c1a	Fix Icon Use the Cmder icon for the application instead of the Cmd.exe icon	2013-12-13 13:27:59 -05:00
Alberto Solano	71513486ee	renamed gitcleanup script	2013-12-13 19:09:25 +01:00
Alberto Solano	3aeae2871a	added missing next	2013-12-13 19:05:21 +01:00
Alberto Solano	d0e383e5c0	added cleanup script for git directory	2013-12-13 00:49:15 +01:00
Alberto Solano	2c8364ce58	fixed little mistake in vendor/readme	2013-12-13 00:32:22 +01:00
Alberto Solano	fc3422e1ba	fixed errors and grammar	2013-12-13 00:32:22 +01:00
Samuel Vasko	72aac17c3e	Latest release	2013-12-12 19:18:04 +01:00
Martin Kemp	feec00f233	Merge pull request #1 from MartiUK/master Remove any ruby implementations of gitcleanup	2013-12-12 04:30:06 -08:00
Martin Kemp	d9a6bb7e5f	Remove any ruby implementations of gitcleanup	2013-12-12 12:29:09 +00:00
Martin Kemp	d396dd9d33	Initial commit of gitcleanup.py Initial commit of gitcleanup.py	2013-12-12 12:24:08 +00:00
Martin Kemp	de30ed5424	Initial git cleanup creation	2013-12-09 17:21:47 +00:00