shawndumas

[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge

ogrrd

Install CakePHP 2.x with Composer

Remove the main CakePHP lib directory

$ cd /path/to/your/website
$ rm -Rf ./lib

Add the following composer.json file

nickbudi

Budi's CS:S Config

This is my constantly updated CS:S autoexec config.

Put the file autoexec.cfg in ...\Steam\steamapps\*steam username*\counter-strike source\cstrike\cfg or take what you want from it and add to your autoexec config!

Launch Options

-novid -noborder -high -threads 4 -freq 144 +exec autoexec.cfg