[Libreoffice-commits] .: 3 commits - .gitattributes

[Bjoern Michaelsen]

 .gitattributes |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1ebc2b93c8928561c7218cb8118bd4b507fa8430
Merge: 2879355... a24c961...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jul 21 18:28:16 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 2879355a7598cdd350286c9cc3557442ed780e20
Merge: a5d7153... 7453b42...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jun 22 18:49:06 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit a5d715327c6ec6dab52e9d7cb0a7e15b3f01dcd0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 18 14:12:16 2011 +0200

    fixing rebase errors

diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 0000000..f18402b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file