From 54511c9615405790667522bc3ff0ffd9a4116c4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20L=2E=20J=C3=B8hndal?= <mariuslj@ifi.uio.no>
Date: Wed, 4 Jun 2014 13:34:25 +0100
Subject: [PATCH] Synchronised with upstream.

---
 latin-nt.conll |  6 +++---
 latin-nt.xml   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/latin-nt.conll b/latin-nt.conll
index fdcc5a5..ee892bc 100644
--- a/latin-nt.conll
+++ b/latin-nt.conll
@@ -48564,7 +48564,7 @@
 15	et	et	C	C-	INFLn	10	pred	_	_
 16	sperabat	spero	V	V-	PERS3|NUMBs|TENSi|MOODi|VOICa	15	pred	_	_
 17	signum	signum	N	Nb	NUMBs|GENDn|CASEa	22	sub	_	_
-18	aliquod	aliqui	P	Px	NUMBs|GENDn|CASEa	17	atr	_	_
+18	aliquod	aliquis	P	Px	NUMBs|GENDn|CASEa	17	atr	_	_
 19	videre	video	V	V-	TENSp|MOODn|VOICa	16	comp	_	_
 20	ab	ab	R	R-	INFLn	22	ag	_	_
 21	eo	is	P	Pp	PERS3|NUMBs|GENDm|CASEb	20	obl	_	_
@@ -60699,7 +60699,7 @@
 1	qui	qui	P	Pr	NUMBs|GENDm|CASEn	2	sub	_	_
 2	accipit	accipio	V	V-	PERS3|NUMBs|TENSp|MOODi|VOICa	7	sub	_	_
 3	si	si	G	G-	INFLn	2	adv	_	_
-4	quem	qui	P	Px	NUMBs|GENDm|CASEa	5	obj	_	_
+4	quem	quis	P	Px	NUMBs|GENDm|CASEa	5	obj	_	_
 5	misero	miseror	V	V-	PERS1|NUMBs|TENSp|MOODi|VOICa	3	pred	_	_
 6	me	ego	P	Pp	PERS1|NUMBs|GENDm|CASEa	7	obj	_	_
 7	accipit	accipio	V	V-	PERS3|NUMBs|TENSp|MOODi|VOICa	0	pred	_	_
@@ -78865,7 +78865,7 @@
 4	transnavigare	transnavigo	V	V-	TENSp|MOODn|VOICa	1	xobj	_	_
 5	Ephesum	Ephesus	N	Ne	NUMBs|GENDf|CASEa	4	obj	_	_
 6	ne	ne	G	G-	INFLn	1	adv	_	_
-7	qua	qui	P	Px	NUMBs|GENDf|CASEn	8	atr	_	_
+7	qua	quis	P	Px	NUMBs|GENDf|CASEn	8	atr	_	_
 8	mora	mora	N	Nb	NUMBs|GENDf|CASEn	10	sub	_	_
 9	illi	ille	P	Pd	NUMBs|GENDm|CASEd	10	obl	_	_
 10	fieret	fio	V	V-	PERS3|NUMBs|TENSi|MOODs|VOICa	6	aux	_	_
diff --git a/latin-nt.xml b/latin-nt.xml
index 7281dca..f67ae3e 100644
--- a/latin-nt.xml
+++ b/latin-nt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<proiel export-time="2014-05-27T21:28:54+02:00" schema-version="2.0">
+<proiel export-time="2014-06-04T12:29:38+02:00" schema-version="2.0">
   <annotation>
     <relations>
       <value tag="adnom" summary="adnominal" primary="true" secondary="true"/>
@@ -160,7 +160,7 @@
     <funder>Research Council of Norway</funder>
     <distributor>Department of Philosophy, Classics, History of Arts and Ideas</distributor>
     <distributor-address>PO Box 1020 Blindern, N-0315 Oslo</distributor-address>
-    <date>27 May 2014</date>
+    <date>04 June 2014</date>
     <license>CC BY-NC-SA 3.0</license>
     <license-url>http://creativecommons.org/licenses/by-nc-sa/3.0/us/</license-url>
     <reference-system>Standard Bible reference system</reference-system>
@@ -62085,7 +62085,7 @@
         <token id="304521" form="et" citation-part="LUKE 23.8" lemma="et" part-of-speech="C-" morphology="---------n" head-id="304516" relation="pred" presentation-after=" "/>
         <token id="304522" form="sperabat" citation-part="LUKE 23.8" lemma="spero" part-of-speech="V-" morphology="3siia----i" head-id="304521" relation="pred" presentation-after=" "/>
         <token id="304523" form="signum" citation-part="LUKE 23.8" lemma="signum" part-of-speech="Nb" morphology="-s---na--i" head-id="304528" relation="sub" presentation-after=" "/>
-        <token id="304524" form="aliquod" citation-part="LUKE 23.8" lemma="aliqui" part-of-speech="Px" morphology="-s---na--i" head-id="304523" relation="atr" presentation-after=" "/>
+        <token id="304524" form="aliquod" citation-part="LUKE 23.8" lemma="aliquis" part-of-speech="Px" morphology="-s---na--i" head-id="304523" relation="atr" presentation-after=" "/>
         <token id="304525" form="videre" citation-part="LUKE 23.8" lemma="video" part-of-speech="V-" morphology="--pna----i" head-id="304522" relation="comp" presentation-after=" ">
           <slash target-id="304522" relation="pred"/>
         </token>
@@ -77215,7 +77215,7 @@
         <token id="315333" form="qui" citation-part="JOHN 13.20" lemma="qui" part-of-speech="Pr" morphology="-s---mn--i" head-id="315334" relation="sub" presentation-after=" "/>
         <token id="315334" form="accipit" citation-part="JOHN 13.20" lemma="accipio" part-of-speech="V-" morphology="3spia----i" head-id="315339" relation="sub" presentation-after=" "/>
         <token id="315335" form="si" citation-part="JOHN 13.20" lemma="si" part-of-speech="G-" morphology="---------n" head-id="315334" relation="adv" presentation-after=" "/>
-        <token id="315336" form="quem" citation-part="JOHN 13.20" lemma="qui" part-of-speech="Px" morphology="-s---ma--i" head-id="315337" relation="obj" presentation-after=" "/>
+        <token id="315336" form="quem" citation-part="JOHN 13.20" lemma="quis" part-of-speech="Px" morphology="-s---ma--i" head-id="315337" relation="obj" presentation-after=" "/>
         <token id="315337" form="misero" citation-part="JOHN 13.20" lemma="miseror" part-of-speech="V-" morphology="1spia----i" head-id="315335" relation="pred" presentation-after=" "/>
         <token id="315338" form="me" citation-part="JOHN 13.20" lemma="ego" part-of-speech="Pp" morphology="1s---ma--i" head-id="315339" relation="obj" presentation-after=" "/>
         <token id="315339" form="accipit" citation-part="JOHN 13.20" lemma="accipio" part-of-speech="V-" morphology="3spia----i" relation="pred" presentation-after=" "/>
@@ -99907,7 +99907,7 @@
         </token>
         <token id="372989" form="Ephesum" citation-part="ACTS 20.16" lemma="Ephesus" part-of-speech="Ne" morphology="-s---fa--i" head-id="372988" relation="obj" presentation-after=" "/>
         <token id="372990" form="ne" citation-part="ACTS 20.16" lemma="ne" part-of-speech="G-" morphology="---------n" head-id="372985" relation="adv" presentation-after=" "/>
-        <token id="372991" form="qua" citation-part="ACTS 20.16" lemma="qui" part-of-speech="Px" morphology="-s---fn--i" head-id="372992" relation="atr" presentation-after=" "/>
+        <token id="372991" form="qua" citation-part="ACTS 20.16" lemma="quis" part-of-speech="Px" morphology="-s---fn--i" head-id="372992" relation="atr" presentation-after=" "/>
         <token id="372992" form="mora" citation-part="ACTS 20.16" lemma="mora" part-of-speech="Nb" morphology="-s---fn--i" head-id="372994" relation="sub" presentation-after=" "/>
         <token id="372993" form="illi" citation-part="ACTS 20.16" lemma="ille" part-of-speech="Pd" morphology="-s---md--i" head-id="372994" relation="obl" presentation-after=" "/>
         <token id="372994" form="fieret" citation-part="ACTS 20.16" lemma="fio" part-of-speech="V-" morphology="3sisa----i" head-id="372990" relation="aux" presentation-after=" "/>