[Libreoffice-commits] Changes to 'feature/gbuild_extensions'

Fri Aug 17 11:40:56 PDT 2012

New branch 'feature/gbuild_extensions' available with the following commits:
commit 128159a72131e1eebf773a3c4b2525ed67e9d3bc
Merge: 26e9ca8eedf46b29903a609c7d20fc138662a907 7e5b321535977ccddc6703c0ad4e5d25af797654
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Fri Jan 6 14:04:29 2012 -0500

    Merge branch 'feature/gbuild_extensions' of git://anongit.freedesktop.org/libreoffice/core into feature/gbuild_extensions

commit 26e9ca8eedf46b29903a609c7d20fc138662a907
Merge: 0dd3e081fbea5b917d4635de9b5cf15db217063c 4572e00ec358f507e64cbab9d9f3430ea6f97d51
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Wed Jan 4 17:36:23 2012 -0500

    Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions
    
    Conflicts:
    	extensions/source/ole/servreg.cxx
    	postprocess/packcomponents/makefile.mk
    	postprocess/prj/build.lst
    	tail_build/prj/build.lst