# HG changeset patch
# User Chris Cannam
# Date 1294315626 0
# Node ID 5d8a5ce96163358d9406a3167e70cfb6d2f8b37b
# Parent  5978a4b18a8965c618fd16e63f0c6830602441f5# Parent  cb8ccbff8f8428a27952f954a4cde3293496408f
Merge

diff -r 5978a4b18a89 -r 5d8a5ce96163 .hgignore
--- a/.hgignore	Thu Jan 06 12:05:34 2011 +0000
+++ b/.hgignore	Thu Jan 06 12:07:06 2011 +0000
@@ -1,26 +1,23 @@
-syntax: glob
-*.core
-*.o
-*~
-*.exe
-*.dll
-*.pyc
-*.orig
-*.user
-moc_*
-qrc_*
-core
-easyhg
-debug/easyhg.exe
-release/easyhg.exe
-Makefile
-Makefile.Debug
-Makefile.Release
-hgexplorer.pro.user
-object_script.hgexplorer.Debug
-object_script.hgexplorer.exe.Release
-object_script.hgexplorer.exe.Debug
-*.app/*
-.DS_Store
-EasyMercurial
-
+syntax: glob
+*.core
+*.o
+*~
+*.exe
+*.dll
+*.pyc
+*.orig
+*.user
+moc_*
+qrc_*
+o/*
+core
+easyhg
+debug/*
+release/*
+Makefile
+Makefile.Debug
+Makefile.Release
+*.app/*
+.DS_Store
+EasyMercurial*
+*.pdb
diff -r 5978a4b18a89 -r 5d8a5ce96163 settingsdialog.cpp
--- a/settingsdialog.cpp	Thu Jan 06 12:05:34 2011 +0000
+++ b/settingsdialog.cpp	Thu Jan 06 12:07:06 2011 +0000
@@ -203,6 +203,7 @@
     settings.setValue("hgbinary", m_hgPathLabel->text());
     settings.setValue("extdiffbinary", m_diffPathLabel->text());
     settings.setValue("mergebinary", m_mergePathLabel->text());
+    settings.setValue("editorbinary", m_editPathLabel->text());
     settings.setValue("extensionpath", m_extensionPathLabel->text());
     settings.endGroup();
     settings.beginGroup("General");