Jan Holesovsky 61a4bf5a07 Merge remote-tracking branch 'origin/integration/dev300_m101' ...

Conflicts:
	set_soenv.in

2011-03-17 16:06:07 +01:00

..

file_python.scp

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-17 16:06:07 +01:00

makefile.mk

Merge Gentoo patches from old build and downstream repositories.

2011-03-14 18:47:10 +01:00

module_python_mailmerge.scp

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-17 16:06:07 +01:00

module_python_mailmerge.ulf

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

module_python.scp

Merge Gentoo patches from old build and downstream repositories.

2011-03-14 18:47:10 +01:00

module_python.ulf

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

profileitem_python.scp

Merge Gentoo patches from old build and downstream repositories.

2011-03-14 18:47:10 +01:00