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

[Bjoern Michaelsen]

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

New commits:
commit 2e320e52a066e29bd6a0950e5519c17fe802d830
Merge: 25b0e3e... 745f015...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jul 21 18:57:42 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 25b0e3e84e32b8e9388c2bcf7bab29c58c681910
Merge: 7498d9b... c71cf20...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jun 22 18:49:45 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 7498d9b2ae3047b6faab10019f44ce98acbf7a52
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