CVS commit: wip/libreoffice3-bin

["Ryo ONODERA" <ryo-on%users.sourceforge.net@localhost>]

Module name:    wip
Committed by:   ryo-on
Date:           Sat May 28 20:06:53 UTC 2011

Modified Files:
        wip/libreoffice3-bin: Makefile
Added Files:
        wip/libreoffice3-bin: options.mk

Log Message:
* Restore java option.
* Add conflict pattern for misc/openoffice3-bin.


To generate a diff of this commit:
cvs -z3 rdiff -u -r0 -r1.1 wip/libreoffice3-bin/options.mk
cvs -z3 rdiff -u -r1.4 -r1.5 wip/libreoffice3-bin/Makefile

To view a diff of this commit:
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/libreoffice3-bin/options.mk?r1=0&r2=1.1
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/libreoffice3-bin/Makefile?r1=1.4&r2=1.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
pkgsrc-wip-cvs mailing list
pkgsrc-wip-cvs%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-cvs