# HG changeset patch
# User insilmaril
# Date 1120807483 0
# Node ID 09edde7ae30e2a33d95b123ad5dffe2f8f2b6c6a
# Parent  09e20ecaf6a3ce5c696a1d7e0838c14c4c7465cb
changes for 1.6.9

diff -r 09e20ecaf6a3 -r 09edde7ae30e texteditor.cpp
--- a/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
+++ b/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
@@ -61,6 +61,7 @@
 TextEditor::TextEditor()
 {
     printer = new QPrinter( QPrinter::HighResolution );
+	printer->setPrinterName (settings.readEntry("/vym/mainwindow/printerName",printer->printerName()));
 
 	// Editor
     e = new QTextEdit( this, "editor" );
@@ -114,7 +115,14 @@
 		actionSettingsFonthintDefault->setOn (false);
 		e->setCurrentFont (varFont);
 	}	
+<<<<<<< texteditor.cpp
 	filenameHint="";
+
+	// Save settings in vymrc
+	settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
+=======
+	filenameHint="";
+>>>>>>> 1.4
 }
 
 
diff -r 09e20ecaf6a3 -r 09edde7ae30e version.h
--- a/version.h	Fri Jul 08 07:24:43 2005 +0000
+++ b/version.h	Fri Jul 08 07:24:43 2005 +0000
@@ -1,7 +1,12 @@
 #ifndef VERSION_H 
 #define VERSION_H
 
+<<<<<<< version.h
+#define __VYM_VERSION__ "1.6.9"
+#define __BUILD_DATE__ "July 04, 2005"
+=======
 #define __VYM_VERSION__ "1.6.8"
 #define __BUILD_DATE__ "June 14, 2005"
+>>>>>>> 1.16
 
 #endif