Olivier Goffart 414ac5433d Merge branch '1.7' ... Conflicts: binary doc/accountsetup.rst doc/architecture.rst doc/navigating.rst doc/owncloudcmd.rst doc/troubleshooting.rst		2015-01-05 14:40:53 +01:00
..
osx	OS X: Improve installer	2014-12-16 19:08:12 +01:00
win	[tx-robot] updated from transifex	2015-01-04 02:06:13 -05:00
CMakeLists.txt	Create Mac Pack: Copy the creator script to the build directory.	2014-08-26 18:13:43 +02:00