Mercurial > hg > Papers > 2018 > nozomi-master

changeset 165:b9222de88889

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp>
date Sun, 04 Feb 2018 17:27:53 +0900
parents 6d6fb11dbd57 (current diff) def221edf421 (diff)
children d09fb22608f1
files
diffstat 2 files changed, 30 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/chapter1.mm	Sun Feb 04 17:25:00 2018 +0900
+++ b/chapter1.mm	Sun Feb 04 17:27:53 2018 +0900
@@ -16,6 +16,31 @@
 <node CREATED="1517656112336" ID="ID_1367174953" MODIFIED="1517656118247" TEXT="&#x5206;&#x6563;&#x30a2;&#x30eb;&#x30b4;&#x30ea;&#x30ba;&#x30e0;"/>
 </node>
 </node>
+<node CREATED="1517729316565" ID="ID_362439521" MODIFIED="1517729322936" POSITION="right" TEXT="&#x5206;&#x6563;&#x8a08;&#x7b97;&#x3068;&#x306f;&#x4f55;&#x304b;">
+<node CREATED="1517729324312" ID="ID_1840867119" MODIFIED="1517729327879" TEXT="&#x8981;&#x7d20;">
+<node CREATED="1517729330103" ID="ID_1217331092" MODIFIED="1517729340687" TEXT="&#x5730;&#x7406;&#x7684;&#x306b;&#x5206;&#x6563;&#x3057;&#x305f;&#x30ce;&#x30fc;&#x30c9;"/>
+<node CREATED="1517729346347" ID="ID_152986611" MODIFIED="1517729368031" TEXT="&#x30ce;&#x30fc;&#x30c9;&#x9593;&#x901a;&#x4fe1;">
+<node CREATED="1517729389113" ID="ID_1654200440" MODIFIED="1517729391919" TEXT="&#x30c8;&#x30dd;&#x30ed;&#x30b8;&#x30fc;"/>
+<node CREATED="1517729395976" ID="ID_72250588" MODIFIED="1517729403671" TEXT="&#x901a;&#x4fe1;&#x3059;&#x308b;&#x30c7;&#x30fc;&#x30bf;&#x578b;"/>
+<node CREATED="1517729409641" ID="ID_83058423" MODIFIED="1517729426759" TEXT="&#x901a;&#x4fe1;&#x306e;&#x4fe1;&#x983c;&#x6027;&#x3001;&#x901f;&#x5ea6;"/>
+<node CREATED="1517729972310" ID="ID_1352810818" MODIFIED="1517729980672" TEXT="&#x8ee2;&#x9001;"/>
+<node CREATED="1517729981713" ID="ID_342685351" MODIFIED="1517729984304" TEXT="&#x5727;&#x7e2e;"/>
+</node>
+<node CREATED="1517729368572" ID="ID_554841496" MODIFIED="1517729372943" TEXT="&#x30ce;&#x30fc;&#x30c9;&#x5185;&#x306e;&#x8a08;&#x7b97;">
+<node CREATED="1517729435296" ID="ID_1229705458" MODIFIED="1517729438479" TEXT="&#x901a;&#x4fe1;&#x30d7;&#x30ed;&#x30c8;&#x30b3;&#x30eb;"/>
+<node CREATED="1517729439415" ID="ID_1377394636" MODIFIED="1517729444359" TEXT="&#x30c7;&#x30fc;&#x30bf;&#x30d9;&#x30fc;&#x30b9;"/>
+</node>
+</node>
+<node CREATED="1517729461136" ID="ID_757077147" MODIFIED="1517729465551" TEXT="&#x5206;&#x6563;&#x30a2;&#x30eb;&#x30b4;&#x30ea;&#x30ba;&#x30e0;">
+<node CREATED="1517729466934" ID="ID_1643090487" MODIFIED="1517729473264" TEXT="&#x30c8;&#x30dd;&#x30ed;&#x30b8;&#x30fc;&#x306e;&#x6c7a;&#x5b9a;">
+<node CREATED="1517729562585" ID="ID_642463144" MODIFIED="1517729571536" TEXT="&#x30ce;&#x30fc;&#x30c9;&#x306e;&#x79fb;&#x52d5;">
+<node CREATED="1517729579392" ID="ID_856936475" MODIFIED="1517729586967" TEXT="&#x9759;&#x7684;&#x30fb;&#x52d5;&#x7684;"/>
+</node>
+</node>
+<node CREATED="1517729474709" ID="ID_1495380842" MODIFIED="1517729478816" TEXT="&#x30d7;&#x30ed;&#x30c8;&#x30b3;&#x30eb;&#x306e;&#x5b9a;&#x7fa9;"/>
+<node CREATED="1517729489620" ID="ID_1154476087" MODIFIED="1517729495671" TEXT="&#x30ce;&#x30fc;&#x30c9;&#x5185;&#x306e;&#x8a08;&#x7b97;"/>
+</node>
+</node>
 <node CREATED="1517639946066" ID="ID_1859525676" MODIFIED="1517639956125" POSITION="right" TEXT="&#x3057;&#x304b;&#x3057;&#x305d;&#x308c;&#x3089;&#x306e;&#x8a18;&#x8ff0;&#x306f;&#x5bb9;&#x6613;&#x3067;&#x306f;&#x306a;&#x3044;">
 <node CREATED="1517656182435" ID="ID_851631258" MODIFIED="1517667405717" TEXT="&#x5834;&#x6240;&#x3092;&#x9078;&#x629e;&#x3059;&#x308b;&#x3068;&#x304d;&#x30e9;&#x30d9;&#x30eb;&#x3092;&#x4f7f;&#x3046;&#x304c;&#x3001;&#x4f7f;&#x3044;&#x65b9;&#x304c;&#x4f55;&#x304c;&#x826f;&#x3044;&#x304b;&#x308f;&#x304b;&#x3089;&#x306a;&#x3044;">
 <node CREATED="1517656223748" ID="ID_495480288" MODIFIED="1517656290983" TEXT="&#x540c;&#x3058;&#x52d5;&#x304d;&#x3092;&#x3059;&#x308b;&#x3082;&#x306e;&#x306f;&#x540c;&#x3058;&#x30e9;&#x30d9;&#x30eb;&#x3092;&#x4f7f;&#x3044;&#x305f;&#x3044;">
--- a/index.mm	Sun Feb 04 17:25:00 2018 +0900
+++ b/index.mm	Sun Feb 04 17:27:53 2018 +0900
@@ -26,6 +26,11 @@
 <node CREATED="1512459206943" ID="ID_1504699433" MODIFIED="1512459211178" TEXT="&#x6c38;&#x7d9a;&#x6027;"/>
 </node>
 <node CREATED="1512457158023" ID="ID_1273481367" MODIFIED="1512459029974" POSITION="left" TEXT="Christie&#x306e;&#x8a2d;&#x8a08;">
+<node CREATED="1517730781217" ID="ID_598401209" MODIFIED="1517730799083" TEXT="&#x8a2d;&#x8a08;&#x65b9;&#x91dd;">
+<node CREATED="1517730800275" ID="ID_12257681" MODIFIED="1517730822410" TEXT="&#xff11;&#x3064;&#x306e;CS&#x306f;&#x6c7a;&#x307e;&#x3063;&#x305f;key&#x3092;&#x5f85;&#x3064;&#x3053;&#x3068;&#x3092;&#x8a18;&#x8ff0;&#x3067;&#x4fdd;&#x8a3c;"/>
+<node CREATED="1517730830531" ID="ID_1323104287" MODIFIED="1517730844642" TEXT="&#x8a18;&#x8ff0;&#x3092;&#x540c;&#x3058;&#x5834;&#x6240;&#x3067;&#x884c;&#x3046;"/>
+<node CREATED="1517730849855" ID="ID_927216113" MODIFIED="1517730874178" TEXT="DS&#x306e;&#x578b;&#x306e;&#x6574;&#x5408;&#x6027;&#x3092;&#x30b3;&#x30f3;&#x30d1;&#x30a4;&#x30eb;&#x6642;&#x306b;&#x4fdd;&#x8a3c;"/>
+</node>
 <node CREATED="1512457188059" ID="ID_1851286703" MODIFIED="1512457417082" TEXT="API&#x306e;&#x6539;&#x5584;">
 <node CREATED="1512458193024" ID="ID_870262193" MODIFIED="1512458248476" TEXT="Annotation&#x3092;&#x7528;&#x3044;&#x305f;setKey">
 <node CREATED="1512458258940" ID="ID_1086285716" MODIFIED="1512458274786" TEXT="DSM&#x306e;key&#x6307;&#x5b9a;&#x304c;&#x306a;&#x304f;&#x306a;&#x308b;"/>