# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1272295744 18000
# Node ID 06478ac50ae0499e89b415539fe06cc614a991a5
# Parent  49840c7f58f4b300697fd155ad062413fc9256f3# Parent  7f978d9fb8f6a9a72aead80b71d1f01c43aad5da
Merge commit

diff -r 49840c7f58f4 -r 06478ac50ae0 core/carbide_releases/run.jstack.bat
--- a/core/carbide_releases/run.jstack.bat	Mon Apr 26 10:28:50 2010 -0500
+++ b/core/carbide_releases/run.jstack.bat	Mon Apr 26 10:29:04 2010 -0500
@@ -1,6 +1,6 @@
 echo off
 
-rem This is a utility batch file to get stack information from the Carbide.c++.2.5.exe process.
+rem This is a utility batch file to get stack information from the Carbide.c++.2.6.exe process.
 rem In order to run it successfully, you will need to have a full JDK installed of version 1.6 or higher.
 rem See http://java.sun.com/javase/downloads/index.jsp for download information.
 rem If the Carbide process is found (and only one should be running) then stack information will be found in %OUTFILE%.
@@ -18,18 +18,18 @@
 
 del %OUTFILE%
 
-rem echo Carbide.c++.2.5.exe >  %outfile%
+rem echo Carbide.c++.2.6.exe >  %outfile%
 
 echo
 echo Searching for Carbide.c++ process...
 
-FOR /F "tokens=2" %%i IN ('tasklist /FI "IMAGENAME eq  Carbide.c++.2.5.exe"
+FOR /F "tokens=2" %%i IN ('tasklist /FI "IMAGENAME eq  Carbide.c++.2.6.exe"
 /NH') DO @%JSTACK% %%i >  %OUTFILE%
 
 
 echo
 if exist %OUTFILE% echo Check for results in %OUTFILE%
-if not exist %OUTFILE% echo ERROR: Results not written. Is Carbide.c++.2.5.exe running?
+if not exist %OUTFILE% echo ERROR: Results not written. Is Carbide.c++.2.6.exe running?
 
 :END