Merge branch 'master' into x86_64

Conflicts: src/servers/app/ServerWindow.cpp
2012-08-16 21:11:15 +01:00
parent 602d9c96a5 8ffa652cac
commit e688bf23d4
445 changed files with 7063 additions and 5041 deletions
@@ -0,0 +1,2 @@
+Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/