source: vbox/trunk@ 64107

Name	Size	Rev	Age	Author	Last Change
../
debian		64072	8 years	vboxsync	deb: allow python 3 for building but prefer python 2
doc		64095	8 years	vboxsync	doc/manual: Solaris zone configuration update.
include		64093	8 years	vboxsync	Storage: Move the NonRotationalMedium property from the devices and …
src		64107	8 years	vboxsync	Windows host installer: Added option to disable creation of start menu …
tools		63748	8 years	vboxsync	Fixed workspace generation for src/VBox/HostDrivers/adpctl.
.dir-locals.el	166 bytes	52664	10 years	vboxsync	Emacs directory local variables. Disable indent-tabs-mode in C/C++ code.
.scm-settings	5.8 KB	62465	8 years	vboxsync	Audio_old
Config.kmk	303.9 KB	64077	8 years	vboxsync	Config.kmk: this is not necessary anymore
configure	82.8 KB	63620	8 years	vboxsync	configure: allow gcc 6.x
configure.vbs	76.7 KB	63334	8 years	vboxsync	configure.vbs: Disable warnings=errors for OSE builds.
COPYING	19.7 KB	35198	14 years	vboxsync	repair line break
COPYING.CDDL	18.3 KB	6010	17 years	vboxsync	export.
Doxyfile.Core	26.0 KB	62693	8 years	vboxsync	update
Maintenance.kmk	2.1 KB	62534	8 years	vboxsync	(C) 2016
Makefile.kmk	83.9 KB	63286	8 years	vboxsync	Moved the both-xxxx and build-xxxx rules from root Makefile to root …

Property svn:mergeinfo set to (toggle deleted branches)

/trunk/src	merged	eligible
/branches/VBox-3.0	58652,70973
/branches/VBox-3.2	66309,66318
/branches/VBox-4.0	70873
/branches/VBox-4.1	74233,78414,78691,82579,85941,85944-85947,85949-85950,85953,86701,86728,87009
/branches/VBox-4.2	82653,86229-86230,86234,86529,91503-91504,91506-91508,91510,91514-91515,91521,108112,108114,108127
/branches/VBox-4.3	89714,91223,94066,94839,94897,95154,95164,95167,95295,95338,95353-95354,95356,95367,95451,95475,95477,95480,95507,95640,95659,95661,95663,98913-98915,99358
/branches/VBox-4.3/trunk	91223
/branches/VBox-5.0	104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
/branches/andy/draganddrop	90781-91268
/branches/andy/guestctrl20	78916,78930
/branches/andy/pdmaudio	94582,94641,94654,94688,94778,94783,94816,95197,95215-95216,95250,95279,95505-95506,95543,95694,96323,96470-96471,96582,96587,96802-96803,96817,96904,96967,96999,97020-97021,97025,97050,97099
/branches/bird/hardenedwindows	92692-94610
/branches/dsen/gui	79076-79078,79089,79109-79110,79112-79113,79127-79130,79134,79141,79151,79155,79157-79159,79193,79197
/branches/dsen/gui2	79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
/branches/dsen/gui3	79645-79692

Note: See TracBrowser for help on using the repository browser.