12 commits

Author	SHA1	Message	Date
Preston Davis	4d4fd1ba97	Conflict merge 1	2015-10-31 06:26:30 -04:00
Preston Davis	20e973bf3d	Updated example.zsh	2015-10-30 02:49:59 -04:00
Preston Davis	c0134a9450	My updated configuration files	2015-10-22 11:31:51 -04:00
Preston Davis	80704610b8	Updated example.sh	2015-10-11 20:50:54 -04:00
Preston Davis	535f9f7a66	Merge branch 'master' of github.com:pebcac/oh-my-zsh ... Conflicts: custom/example.zsh	2015-10-11 20:47:01 -04:00
Preston Davis	6805d45150	My shortcuts	2015-10-11 13:28:39 -04:00
Preston Davis	2877573c11	Removed sample text files	2015-10-07 12:24:28 -07:00
Preston Davis	7bb6484496	added two files	2015-10-07 11:40:40 -07:00
Preston Davis	90f37190a2	Added line to change default shell to tmux	2015-10-07 11:32:02 -07:00
Peter Jaros	af03da0dc9	Move example plugin to the custom plugins dir.	2012-05-16 14:51:52 -04:00
Jake Bell	f8aae64e47	Adding ability to override plugins from the custom directory.	2011-05-26 12:34:37 -05:00
Robby Russell	107322c2e8	Moving some example files into custom/	2009-09-23 08:02:58 -07:00