[Libreoffice-commits] .: 4 commits - .gitattributes qadevOOo/JunitTest_qadevOOo_unoapi.mk

[Bjoern Michaelsen]

 .gitattributes                        |    1 +
 qadevOOo/JunitTest_qadevOOo_unoapi.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9a66cb7df5d44ca1c7c97cfda0f07b258525b9fc
Merge: 7aaf924... 9832101...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jul 21 18:57:43 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 7aaf924eb729a31487f413674e1e89664ea6ad2f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jun 22 11:52:45 2011 +0200

    gnumake4: update qadevOOo for gbuild changes

diff --git a/qadevOOo/JunitTest_qadevOOo_unoapi.mk b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
index dfa3764..6196ef2 100644
--- a/qadevOOo/JunitTest_qadevOOo_unoapi.mk
+++ b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,qadevOOo_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,qadevOOo_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,qadevOOo_unoapi,\
     $$(DEFS) \
commit dd333eccf81cebfce77a47a95f9b4a3d78fd1a38
Merge: 5dee0f0... 5b5d30e...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jun 20 09:36:26 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 5dee0f04b85d2523d006b6e5812040301c41b779
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