source: vbox/trunk@ 57087

Name	Size	Rev	Age	Author	Last Change
../
debian		56894	9 years	vboxsync	5.0.0
doc		57073	9 years	vboxsync	Edited user_Introduction.xml adding disk-image encryption on ext-pack …
include		57086	9 years	vboxsync	Added PCLOGOHDR.
src		57087	9 years	vboxsync	tstDeviceStructSizeRC.cpp: Missed these ofc as I'm on darwin.
tools		56913	9 years	vboxsync	gen-slickedit-workspace.sh openssl update
.dir-locals.el	166 bytes	52664	10 years	vboxsync	Emacs directory local variables. Disable indent-tabs-mode in C/C++ code.
.scm-settings	5.7 KB	56334	10 years	vboxsync	.scm-settings: updates
Config.kmk	263.2 KB	57032	9 years	vboxsync	Config.kmk/solaris: 'pkg contents -H -t set -o pkg.fmri system/kernel' …
configure	75.1 KB	56243	10 years	vboxsync	configure: typo
configure.vbs	74.4 KB	56905	9 years	vboxsync	Config.kmk: stop pretending that VBOX_WITHOUT_COM has any effect
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.5 KB	56414	10 years	vboxsync	no change

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,98913-98915,99358
/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.