Merge remote-tracking branch 'origin/master' into yelp

Browse Source

* origin/master:
  Got rid of stupid python-mode, now using python.el.

Conflicts:
	init.el

...

This commit is contained in:

Ivan Malison 2013-03-25 14:32:28 -07:00

parent 780e5a52f3 2819245c3c

commit 1c0e86f017

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available