Merge branch 'master' of git@github.com:jpenney/emacs-starter-kit

Conflicts: .gitignore
jpenney · Apr 2, 2009 · 732045e · 732045e
2 parents 0d79b02 + 99bfd77
commit 732045e
Show file tree

Hide file tree

Showing 247 changed files with 80,692 additions and 14,868 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,12 +6,20 @@ custom.el
 places
 url/cookies
 elpa-to-submit/jabber/jabber.info
-elpa-to-submit/nxhtml/etc/schema/xhtml-loader.rnc
+elpa-to-submit/nxhtml/etc/schema/xhtml-loader.rnc*
 thumbs/*
 oddmuse/*
 .newsrc-dribble
 .nnmail-cache
 /#.newsrc-dribble#
 .svn
 .DS_Store
-elpa-to-submit/nxhtml/etc/schema/xhtml-loader.rnc~
+*/#*#
+*/CVS/*.Extra
+**/CVS/*.Extra
+CVS/Entries.Old
+Entries.Old
+Entries.Extra
+Entries.Extra.Old
+.org-id-locations
+