New branch 'feature/androidapp' available with the following commits:
commit 0f5c06d23864222951d93d76bfaf3be1e23bc8b7
Author: Michael Meeks <[email protected]>
Date: Fri Dec 14 11:50:22 2012 +0000
android: share more of the Makefile / build logic
commit c3d630a703f8a6706550cea491c7445897b15cf2
Author: Michael Meeks <[email protected]>
Date: Thu Dec 13 19:33:42 2012 +0000
Revert "Clean up remains of NativeActivity-based Android app support"
This reverts commit cecc926070ee3d2ad6296fc5e0cfcde8642bb140.
Conflicts:
sal/android/lo-bootstrap.c
sal/inc/osl/detail/android-bootstrap.h
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
