Commit Graph

17 Commits

Author SHA1 Message Date
27ec88c43e Merge remote-tracking branch 'origin/master' into yelp
Conflicts:
	elpa/find-file-in-project-3.2/find-file-in-project.el
	init.el
	lisp/emacs-testify
2013-07-18 20:26:45 -07:00
4d1530b9d8 A bunch of small fixes. 2013-07-08 11:13:35 -07:00
767b5c276e Added caching to find-file-in-project. 2013-04-11 10:42:47 -07:00
a74a7c7ef7 Added caching to find-file-in-project. 2013-04-11 10:40:05 -07:00
903ab9e2d7 commit for merge 2013-04-10 15:43:11 -07:00
780e5a52f3 Got rid of stupid python-mode, now using python.el. 2013-03-25 14:31:41 -07:00
2819245c3c Got rid of stupid python-mode, now using python.el. 2013-03-25 14:28:49 -07:00
eac51bdc57 Got rid of buggy starter-kit lisp mode. 2013-03-24 12:58:27 -07:00
58a9a9d0ba Added emacs starter kit. 2013-03-24 12:56:49 -07:00
82103ae761 Fixed dumb python-mode hijaking ruby thing. 2013-03-24 00:47:03 -07:00
b411260400 Removed yasnippet. 2013-03-20 10:31:15 -07:00
688bf2c799 Added yasnippet bundle. 2013-03-19 02:00:00 -07:00
092e195a7c Changing yasnippet pointer back. 2013-03-19 00:36:13 -07:00
760cabd4b2 Removed .elc files. 2013-03-16 20:10:33 -07:00
3110354532 Added theme stuff. 2013-03-16 20:09:42 -07:00
0be2b6a4cd Fixing things up. 2013-03-16 18:20:21 -07:00
d14b633d9e Initial 2013-03-15 10:35:58 -07:00