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

[Bjoern Michaelsen]

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

New commits:
commit 46b7e00f5b4e1281a2b3be35db70f90255374531
Merge: c9bbd4a... 09d0e63...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jul 24 19:23:00 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit c9bbd4a42c05c35c28bd5ca64cfd892762052024
Merge: edcf1e4... 890c60f...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jul 21 18:51:33 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit edcf1e43713c5390cc9324709810bde65a8ae3c8
Merge: a98ef12... 11eb56d...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jun 22 18:49:45 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit a98ef1231e3a7f9540eac2fd338d775928f20b45
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 18 14:12:17 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