src-server

Timestamp:

Apr 9, 2014 2:30:39 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93216

Message:

Temporarily renamed iprt/x509.h to iprt/x509-branch-collision.h to avoid trouble when merging branch code later.

File:

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

r50904	r51014
47	47	#include <VBox/settings.h>
48	48
49		#include <iprt/x509.h>
	49	#include <iprt/x509-branch-collision.h>
50	50	#include <set>
51	51

Note: See TracChangeset for help on using the changeset viewer.