# HG changeset patch
# User cawthron
# Date 1240681620 18000
# Node ID 81d8e95d1a02fbfe83ff0fb0e70d1e06c06c6003
# Parent  0e6d23e2b4660b7a5f311d0b7035f3c7f520bcd0# Parent  648636cfa8496aae56f43e21d4368d2ae461dff2
merge heads from Austin sync

diff -r 0e6d23e2b466 -r 81d8e95d1a02 .branch.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.branch.txt	Sat Apr 25 12:47:00 2009 -0500
@@ -0,0 +1,1 @@
+default
diff -r 0e6d23e2b466 -r 81d8e95d1a02 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sat Apr 25 12:47:00 2009 -0500
@@ -0,0 +1,4 @@
+# use glob syntax.
+syntax: glob
+bin
+
diff -r 0e6d23e2b466 -r 81d8e95d1a02 cdt/cdt_5_0_x/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
--- a/cdt/cdt_5_0_x/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java	Fri Apr 03 17:12:41 2009 +0100
+++ b/cdt/cdt_5_0_x/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java	Sat Apr 25 12:47:00 2009 -0500
@@ -177,10 +177,15 @@
 								// open the file from the breakpoints view it opens in the
 								// proper editor.
 								IProject project = b.getMarker().getResource().getProject();
-								ICProject cproject = CoreModel.getDefault().create(project);
-								String id = CoreModel.getRegistedContentTypeId(project, path.lastSegment());
-								ExternalTranslationUnit tu = new ExternalTranslationUnit(cproject, URIUtil.toURI(path), id);
-								return new ExternalEditorInput( tu, new LocalFileStorage( fsfile ) );
+								if (project != null)
+									{
+									ICProject cproject = CoreModel.getDefault().create(project);
+									String id = CoreModel.getRegistedContentTypeId(project, path.lastSegment());
+									ExternalTranslationUnit tu = new ExternalTranslationUnit(cproject, URIUtil.toURI(path), id);
+									return new ExternalEditorInput( tu, new LocalFileStorage( fsfile ) );
+									}
+								else
+									return new FileEditorInput( file );
 							}
 						}
 					}