source: vbox/trunk@ 53840

Name	Size	Rev	Age	Author	Last Change
../
debian		51424	10 years	vboxsync	debian: sync
doc		53545	10 years	vboxsync	doc/manual: fixed 'VBoxManage guestproperty get' description
include		53835	10 years	vboxsync	VMMSwitcher: also mask NMI in APIC_REG_LVT_CMCI
src		53840	10 years	vboxsync	addded more Windows resource files
tools		53766	10 years	vboxsync	new openssl version.
.dir-locals.el	166 bytes	52664	10 years	vboxsync	Emacs directory local variables. Disable indent-tabs-mode in C/C++ code.
.scm-settings	5.6 KB	53624	10 years	vboxsync	scm automatic cleanups.
Config.kmk	254.0 KB	53728	10 years	vboxsync	VMSVGA3d/darwin: Using the use OpenGL 3.2 Core profile works better, …
configure	74.3 KB	51968	10 years	vboxsync	configure: typo
configure.vbs	74.4 KB	42606	12 years	vboxsync	configure.vbs: MinGW-w64.
COPYING	19.7 KB	35198	14 years	vboxsync	repair line break
COPYING.CDDL	18.3 KB	6010	17 years	vboxsync	export.
Doxyfile.Core	21.5 KB	41857	12 years	vboxsync	Word and diagram wrt contexts.
Maintenance.kmk	2.1 KB	53614	10 years	vboxsync	Maintenance.kmk: Quick way of getting at 'incs', 'docs', and other …
Makefile.kmk	74.0 KB	52855	10 years	vboxsync	Makefile.kmk: bugfix

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
/branches/VBox-4.3	91223,94066,94839,94897,95154,95164,95167,95295,95338,95353-95354,95356,95367,95451,95475,95477,95480,95507,95640,95659,95661,95663
/branches/VBox-4.3/trunk	91223
/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.