source: vbox/trunk@ 61205

Name	Size	Rev	Age	Author	Last Change
../
debian		61063	8 years	vboxsync	deb: dh_desktop is obsolete since 2009
doc		60997	9 years	vboxsync	Manual: Clearer wording (GA mention confused some users).
include		61166	8 years	vboxsync	Audio: Implemented ability to specify two different audio formats via …
src		61205	8 years	vboxsync	sorry
tools		61114	8 years	vboxsync	gen-slickedit-workspace.sh: openssl version changed
.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	9 years	vboxsync	.scm-settings: updates
Config.kmk	282.3 KB	61157	8 years	vboxsync	Audio: - Unified GPDMAUDIOGSTSTRMIN / PDMAUDIOGSTSTRMOUT / …
configure	82.5 KB	61131	8 years	vboxsync	configure: minimum Python version is 2.6 on all platforms since making …
configure.vbs	76.6 KB	60723	9 years	vboxsync	configure.vbs + Installer/win: make the configure script deal with Qt5 …
COPYING	19.7 KB	35198	14 years	vboxsync	repair line break
COPYING.CDDL	18.3 KB	6010	17 years	vboxsync	export.
Doxyfile.Core	25.9 KB	60598	9 years	vboxsync	Doxyfile.Core: bs3kit updates.
Maintenance.kmk	2.1 KB	53614	10 years	vboxsync	Maintenance.kmk: Quick way of getting at 'incs', 'docs', and other …
Makefile.kmk	84.2 KB	61048	8 years	vboxsync	Solaris: Makefile: Qt5 migration(part 115): Legacy libraries not …

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	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.