Merge branch 'master' into vim-clean

[dotfiles.git] / dwb / default / bookmarks

diff --git a/dwb/default/bookmarks b/dwb/default/bookmarks
index c58432beffa564a800bcc7ea86c00bf76e81f542..4853171ae28a725d66885756487096d7c8df41df 100644 (file)
--- a/dwb/default/bookmarks
+++ b/dwb/default/bookmarks
@@ -1,11 +1,21 @@
-https://www.facebook.com/?ref=logo Facebook
-https://eleum.unimaas.nl/ Blackboard Learn
-http://chakra-project.org/ Chakra | Welcome
-https://www.humblebundle.com/ Humble Origin Bundle (pay what you want and help charity)
-https://myum.unimaas.nl/irj/portal SAP NetWeaver Portal

 http://awesome.naquadah.org/ about - awesome window manager
 http://awesome.naquadah.org/ about - awesome window manager

-http://swarmlab.unimaas.nl/autonomous-systems/ Autonomous Systems (KEN4114) – Fall 2013 « Swarmlab
-https://plus.google.com Google+
+http://chakraos.org/home/ Chakra | Home
+http://eudyptula-challenge.org/ The Eudyptula Challenge

 http://paste.chakra-project.org/ New paste • The Chakra Project - Pastebin
 http://paste.chakra-project.org/ New paste • The Chakra Project - Pastebin

+http://swarmlab.dyndns.org/ KForge - Home
+http://upstream-tracker.org/ Upstream Tracker for C/C++ Libraries
+http://www.ex-parrot.com/~pete/upside-down-ternet.html Upside-Down-Ternet
+http://www.explainxkcd.com/wiki/index.php/Main_Page explain xkcd

 http://www.reddit.com/ reddit: the front page of the internet
 http://www.reddit.com/ reddit: the front page of the internet

-http://www.intorobotics.com/how-to-detect-and-track-object-with-opencv/ How to Detect and Track Object With OpenCV - Into Robotics
+https://eleum.unimaas.nl/ Blackboard Learn
+https://mail.google.com Gmail
+https://myum.unimaas.nl/irj/portal MyUm
+https://plus.google.com Google+
+https://tardis:60665/ ZNC - Web Frontend
+https://wiebetaaltwat.nl/ Wiebetaaltwat.nl
+https://www.bnpparibasfortis.be/private/Start.asp BNP Paribas Fortis, la banque et l'assurance d'un monde qui change
+https://www.dropbox.com/ Dropbox
+https://www.facebook.com/ Facebook
+https://www.humblebundle.com/ Humble Bundle
+https://www.loomio.org/ Loomio
+http://blog.techdev.de/code-snippet-edit-a-file-in-all-branches-using-git/ Code Snippet: Edit a File in all Branches using Git | techdev Solutions