summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwight <dmerriman@gmail.com>2008-09-23 10:56:43 -0400
committerDwight <dmerriman@gmail.com>2008-09-23 10:56:43 -0400
commit8336f47b60e044d628c2933b9cb848f945d0383e (patch)
tree5b95d574a50ef9bbef8dce94411b2e21937dde28
parent362fc87a72e873833192ed658532559ebad093eb (diff)
parentd27e5f560de88d7b123f47d57e1954beae9e5d8b (diff)
downloadmongo-8336f47b60e044d628c2933b9cb848f945d0383e.tar.gz
Merge branch 'master' of ssh://git.10gen.com/data/gitroot/pr0.1.4_rc1
-rw-r--r--db/javajs.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/db/javajs.cpp b/db/javajs.cpp
index f0795e95888..bb166646bf8 100644
--- a/db/javajs.cpp
+++ b/db/javajs.cpp
@@ -498,6 +498,8 @@ const char * findEd(){
possibleEdDirs.push_back( "../../ed/ed/" ); // this one for dwight dev box
possibleEdDirs.push_back( "../ed/" );
possibleEdDirs.push_back( "../../ed/" );
+ possibleEdDirs.push_back( "../babble/" );
+ possibleEdDirs.push_back( "../../babble/" );
}
for ( list<const char*>::iterator i = possibleEdDirs.begin() ; i != possibleEdDirs.end(); i++ ){