Mercurial > hg > Papers > 2014 > nobuyasu-master

diff paper/graffle/merge_imp2.graffle @ 23:21e1a110f258

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Writed description of merge
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Thu, 23 Jan 2014 21:15:10 +0900
parents 56753cfbeeab
children
line wrap: on
line diff
--- a/paper/graffle/merge_imp2.graffle	Thu Jan 23 19:05:44 2014 +0900
+++ b/paper/graffle/merge_imp2.graffle	Thu Jan 23 21:15:10 2014 +0900
@@ -52,6 +52,36 @@
 	<key>GraphicsList</key>
 	<array>
 		<dict>
+			<key>Bounds</key>
+			<string>{{429.68295955657959, 329.73361206054688}, {36.423714896880369, 40.175481687463943}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>148</integer>
+			<key>Shape</key>
+			<string>Circle</string>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Width</key>
+					<real>3</real>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1265
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 2A}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>Head</key>
@@ -239,36 +269,6 @@
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{429.68295955657959, 329.73361206054688}, {36.423714896880369, 40.175481687463943}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>148</integer>
-			<key>Shape</key>
-			<string>Circle</string>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>3</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1265
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
-
-\f0\fs24 \cf0 2A}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
 			<string>{{189.18295097351074, 329.73361206054688}, {36.423714896880369, 40.175481687463943}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
@@ -890,7 +890,7 @@
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2014-01-23 10:03:51 +0000</string>
+	<string>2014-01-23 12:07:50 +0000</string>
 	<key>Modifier</key>
 	<string>Oshiro Nobuyasu</string>
 	<key>NotesVisible</key>
@@ -971,7 +971,7 @@
 			</dict>
 		</array>
 		<key>Frame</key>
-		<string>{{108, 36}, {693, 922}}</string>
+		<string>{{298, 36}, {693, 922}}</string>
 		<key>ListView</key>
 		<true/>
 		<key>OutlineWidth</key>