diff options
| author |  Tom Willemsen | 2012-12-14 00:32:05 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-12-14 00:32:05 +0100 |
| commit | 5cff0a1e0982f4a3d737468a9bed2d7b977da36b (patch) | |
| tree | 119219396026ca27903f744228807af7f4f22574 /.emacs.d/site-lisp/newsticker-init.el | |
| parent | 38194c9c34dff080d8751ca0d1f6c7b2eab128e7 (diff) | |
| parent | f1ad7ad10397da82f72157e9e1849df1d2e4a1d3 (diff) | |
| download | dotfiles-5cff0a1e0982f4a3d737468a9bed2d7b977da36b.tar.gz dotfiles-5cff0a1e0982f4a3d737468a9bed2d7b977da36b.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
dotfiles.mk
Diffstat (limited to '.emacs.d/site-lisp/newsticker-init.el')
| -rw-r--r-- | .emacs.d/site-lisp/newsticker-init.el | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.emacs.d/site-lisp/newsticker-init.el b/.emacs.d/site-lisp/newsticker-init.el index da166d1..5d60850 100644 --- a/.emacs.d/site-lisp/newsticker-init.el +++ b/.emacs.d/site-lisp/newsticker-init.el @@ -67,9 +67,6 @@ "http://news.ycombinator.com/rss" nil nil nil) ("HowtoForge - Linux Howtos and Tutorials -" "http://www.howtoforge.com/node/feed" nil nil nil) - ("IBM developerWorks : Linux" - "http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp" - nil nil nil) ("Linuxtoday.com" "http://linuxtoday.com/backend/biglt.rss" nil nil nil) ("Linux.com - Content Feed" @@ -95,7 +92,17 @@ nil nil nil) ("Recent Commits to python-django.el:master" "https://github.com/fgallina/python-django.el/commits/master.atom" - nil nil nil))) + nil nil nil) + ("git.tuxfamily.org Git - sawfish.main.git/atom log" + "http://git.tuxfamily.org/sawfish/main.git?p=sawfish/main.git;a=atom" + nil nil nil) + ("BLABBERMOUTH.NET Latest News" + "http://feeds.feedburner.com/blabbermouth" nil nil nil) + ("QJ.NET" + "http://feeds.feedburner.com/QjGameNewsOpinionsBlogsandMore" + nil nil nil) + ("Beej's Bit Bucket" + "http://beej.us/blog/rss.xml" nil nil nil))) (setq newsticker-use-full-width nil) (provide 'newsticker-init) |