ver.1.2.3.0 release.

hibara · Oct 22, 2013 · 9e9128f · 9e9128f
1 parent 8cfdc96
commit 9e9128f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 50 deletions.
diff --git a/MarkDownSharpEditor/Form1.cs b/MarkDownSharpEditor/Form1.cs
@@ -49,10 +49,6 @@ public partial class Form1 : Form
 
 		private bool _fConstraintChange = true;	                           //更新状態の抑制 ( Constraint changing flag )
 		private List<MarkdownSyntaxKeyword> _MarkdownSyntaxKeywordAarray = new List<MarkdownSyntaxKeyword>();  // Array of MarkdownSyntaxKeyword Class
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/develop
 		private ArrayList _SyntaxArrayList = new ArrayList();
 
 		//-----------------------------------
@@ -163,10 +159,7 @@ private void Form1_Load(object sender, EventArgs e)
 			//エディターのシンタックスハイライター設定の反映
 			//Syntax highlighter of editor window is enabled 
 			_MarkdownSyntaxKeywordAarray = MarkdownSyntaxKeyword.CreateKeywordList();
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/develop
 			//-----------------------------------
 			//選択中のエンコーディングを表示
 			//View selected character encoding name
@@ -988,11 +981,7 @@ private bool OpenFile(string FilePath, bool fOpenDialog = false)
 
 			//-----------------------------------
 			//ペアとなるCSSファイルがあるか探索してあれば適用する
-<<<<<<< HEAD
-			//Apply that the pair CSS file to this file exists  
-=======
 			//Apply that the pair CSS file to this file exists
->>>>>>> origin/develop
 			foreach (AppHistory data in MarkDownSharpEditor.AppSettings.Instance.ArrayHistoryEditedFiles)
 			{
 				if (data.md == _MarkDownTextFilePath)
@@ -1385,25 +1374,14 @@ private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerComple
 					//Restore scroll bar position
 					if (doc != null)
 					{
-#if false
-						while (webBrowser1.ReadyState != WebBrowserReadyState.Complete)
-						{
-							Application.DoEvents();
-						}
-						doc.Window.ScrollTo(scrollpos);
-#endif
 						waitTask.ContinueWith((arg1) =>
 						{
 							this.BeginInvoke(new Action(() =>
 							{
 								doc.Window.ScrollTo(scrollpos);
-<<<<<<< HEAD
-								this.webBrowser1.Document.Body.AttachEventHandler("onscroll", OnScrollEventHandler);
-=======
 
 								this.webBrowser1.Document.Body.AttachEventHandler("onscroll", OnScrollEventHandler);
 
->>>>>>> origin/develop
 							}));
 						});
 					}
@@ -1499,10 +1477,6 @@ void browserWaitTimer_Tick(object sender, EventArgs e)
 		int timerCount = 0;
 		Timer browserWaitTimer;
 
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/develop
 		//----------------------------------------------------------------------
 		// BackgroundWorker Syntax hightlighter work
 		//----------------------------------------------------------------------
@@ -2698,11 +2672,7 @@ private void menuOption_Click(object sender, EventArgs e)
 			frm3.ShowDialog();
 			frm3.Dispose();
 
-<<<<<<< HEAD
-			_MarkdownSyntaxKeywordAarray = MarkdownSyntaxKeyword.CreateKeywordList(); //キーワードリストの更新
-=======
 			_MarkdownSyntaxKeywordAarray = MarkdownSyntaxKeyword.CreateKeywordList();	 //キーワードリストの更新
->>>>>>> origin/develop
 			if (backgroundWorker2.IsBusy == false)
 			{
 				//SyntaxHightlighter on BackgroundWorker

diff --git a/installer/app_version.xml b/installer/app_version.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <markdownsharpeditor>
-  <version>1.2.2.0</version>
-  <date>2013/06/27</date>
+  <version>1.2.3.0</version>
+  <date>2013/10/22</date>
   <url>http://hibara.org/software/jsonsharpeditor/</url>
 </markdownsharpeditor>
diff --git a/installer/mked1230.exe b/installer/mked1230.exe
diff --git a/installer/mked1230.exe.md5 b/installer/mked1230.exe.md5
@@ -1 +1 @@
-c415e8dcff4c5161f297bf2744f9d310
+4b4c3bdb3755d5cfd43fc5d2007569c5
diff --git a/installer/mked1230.exe.sha1 b/installer/mked1230.exe.sha1
@@ -1 +1 @@
-4339c350973bc823cdaebfe0df79acae895cb355
+446b9d5ce4326a24cf42eb418e6a7d6f6836f378
diff --git a/tools/ResHacker/ResHacker.ini b/tools/ResHacker/ResHacker.ini
@@ -1,17 +1,17 @@
 <<<<<<< HEAD
 
 [MRU List]
-<<<<<<< HEAD
-MRU1=M:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug\MarkDownSharpEditor.exe
-MRU2=X:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Release\MarkDownSharpEditor.exe
-MRU3=X:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug\MarkDownSharpEditor.exe
-MRU4=M:\Dropbox\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug\MarkDownSharpEditor.exe
-=======
+<<<<<<< HEAD
+MRU1=C:\Users\mhibara\Documents\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Release\MarkDownSharpEditor.exe
+MRU2=M:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug\MarkDownSharpEditor.exe
+MRU3=X:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Release\MarkDownSharpEditor.exe
+MRU4=X:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug\MarkDownSharpEditor.exe
+====
 MRU1=M:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Release\MarkDownSharpEditor.exe
 MRU2=M:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug\MarkDownSharpEditor.exe
 MRU3=X:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Release\MarkDownSharpEditor.exe
 MRU4=X:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug\MarkDownSharpEditor.exe
->>>>>>> origin/develop
+>>>>>>> origin/develop
 
 [Setup]
 left=259
@@ -20,11 +20,11 @@ width=681
 height=367
 MaximizedState=0
 vsplit=200
-<<<<<<< HEAD
-LastOpenedDir=M:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug
-=======
+<<<<<<< HEAD
+LastOpenedDir=C:\Users\mhibara\Documents\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Release
+====
 LastOpenedDir=M:\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Release
->>>>>>> origin/develop
+>>>>>>> origin/develop
 LastSavedDir=
 
 [Font]
@@ -34,11 +34,11 @@ CharSet=1
 Color=-2147483640
 Style=0
 
-<<<<<<< HEAD
-=====
-=======
-=
->>>>>>> origin/develop
+<<<<<<< HEAD
+==
+====
+
+>>>>>>> origin/develop
 
 [MRU List]
 MRU1=C:\Users\mhibara\Documents\GitHub\MarkDownSharpEditor\MarkDownSharpEditor\bin\Debug\MarkDownSharpEditor.exe