office-gobmx/solenv/gbuild/templates
Bjoern Michaelsen 81a1c065fd Merge branch 'master' into feature/gnumake4
Conflicts:
	Repository.mk
	RepositoryFixes.mk
	configure
	configure.in
	set_soenv.in
	solenv/config/sdev300.ini
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/CustomTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/StaticLibrary.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/platform/winmingw.mk
	solenv/gbuild/templates/Executable.mk
	solenv/gbuild/templates/Library.mk
	solenv/inc/libs.mk
	solenv/inc/unxobsd.mk
2011-06-19 11:36:52 +02:00
..
AllLangResTarget.mk Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +01:00
CppunitTest.mk Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +01:00
Executable.mk Merge branch 'master' into feature/gnumake4 2011-06-19 11:36:52 +02:00
JunitTest.mk Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +01:00
Library.mk Merge branch 'master' into feature/gnumake4 2011-06-19 11:36:52 +02:00
Makefile
makefile.mk Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +01:00
Module.mk Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +01:00
Package.mk Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +01:00
StaticLibrary.mk Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +01:00