Bozhidar Batsov 9fcc478b97 Merge branch 'master' of github.com:bbatsov/prelude ... Conflicts: prelude/prelude-auto-install.el		2012-04-23 12:15:31 +03:00
..
prelude-auto-install.el	Merge branch 'master' of github.com:bbatsov/prelude	2012-04-23 12:15:31 +03:00
prelude-core.el	a few fixes	2012-04-17 17:47:05 +03:00
prelude-editor.el	minor change	2012-04-23 12:13:56 +03:00
prelude-global-keybindings.el	a few fixes	2012-04-17 17:47:05 +03:00
prelude-mode.el	extracted non-essential modules to a separate project	2012-04-17 17:35:21 +03:00
prelude-osx.el	extracted non-essential modules to a separate project	2012-04-17 17:35:21 +03:00
prelude-packages.el	moved back ack support to prelude's core	2012-04-19 11:35:17 +03:00
prelude-ui.el	extracted non-essential modules to a separate project	2012-04-17 17:35:21 +03:00