Merge branch 'next' (3.β is stable now)

2009-06-26 13:27:06 +02:00
parent dc548fb797 aaccc0e62c
commit 28c4b045d6
43 changed files with 3218 additions and 764 deletions
--- a/website/screenshots/index.html
+++ b/website/screenshots/index.html
@ -78,7 +78,6 @@ li {
  <li>
    <a href="/screenshots/i3-5.png">i3 v3.α-bf2</a>, mc, vim, xosview, mplayer, irssi, gajim, i3status
  </li>
-
 </ul>

 <h2>Screencasts</h2>