Merge branch 'master' of gitorious.org:owncloud/mirall

This commit is contained in:
Klaas Freitag 2012-05-11 10:19:55 +02:00
commit eb6dd2bacf

3
.gitignore vendored
View file

@ -1,3 +1,4 @@
build
*flymake*
CMakeLists.txt.user
qtcreator-build/*