# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1203012418 -3600
# Node ID 6fbc419f4acd438956e20fb664ca3a7918d84065
# Parent  cc00a2772bf45f55793ceaa7e10cf7f9118367f0# Parent  8ffc762c64fc2c9a938393b157eebfd0d5abef1a
merge

diff -r cc00a2772bf4 -r 6fbc419f4acd dwt.manifest
--- a/dwt.manifest	Wed Feb 13 17:40:04 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="SWT.javaw" type="win32"/><description>Standard Widget Toolkit</description><dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>
\ No newline at end of file
diff -r cc00a2772bf4 -r 6fbc419f4acd dwt.rc
--- a/dwt.rc	Wed Feb 13 17:40:04 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-#include "windows.h"
-
-/* NOTE: PUTTING NEW LINES IN THE MANIFEST FILE CAUSES IT TO FAIL */
-#define MANIFEST_RESOURCE_ID 2
-MANIFEST_RESOURCE_ID RT_MANIFEST "dwt.manifest"
diff -r cc00a2772bf4 -r 6fbc419f4acd dwt.res
Binary file dwt.res has changed