# HG changeset patch
# User Yuhi TOMARI <yuhi@cr.ie.u-ryukyu.ac.jp>
# Date 1424148667 -32400
# Node ID c793d5feb2e7df7914d6ed68f21d192c51e73800
# Parent  95f479947d96ed846d2810edd47b2bdc06919a69
merge

diff -r 95f479947d96 -r c793d5feb2e7 paper/master_paper.pdf
Binary file paper/master_paper.pdf has changed