Revision: 18740
http://sourceforge.net/p/gate/code/18740
Author: ian_roberts
Date: 2015-06-01 22:55:48 +0000 (Mon, 01 Jun 2015)
Log Message:
-----------
Merged 18739 from trunk
Modified Paths:
--------------
gate/branches/release-8.1/plugins/ANNIE/resources/gazetteer/bands.lst
gate/branches/release-8.1/plugins/ANNIE/resources/gazetteer/radio_stations_uk.lst
Property Changed:
----------------
gate/branches/release-8.1/
gate/branches/release-8.1/plugins/
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/Gaze.java
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/GeneralEditorException.java
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/MappingTreeView.java
Index: gate/branches/release-8.1
===================================================================
--- gate/branches/release-8.1 2015-06-01 19:54:23 UTC (rev 18739)
+++ gate/branches/release-8.1 2015-06-01 22:55:48 UTC (rev 18740)
Property changes on: gate/branches/release-8.1
___________________________________________________________________
Modified: svn:mergeinfo
## -3,3 +3,4 ##
/gate/branches/release-7.1:16361,16363
/gate/branches/sawdust:17055-17079
/gate/tags/release-7.0:15399-15407
+/gate/trunk:18739
\ No newline at end of property
Index: gate/branches/release-8.1/plugins
===================================================================
--- gate/branches/release-8.1/plugins 2015-06-01 19:54:23 UTC (rev 18739)
+++ gate/branches/release-8.1/plugins 2015-06-01 22:55:48 UTC (rev 18740)
Property changes on: gate/branches/release-8.1/plugins
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
/gate/branches/release-7.0/plugins:15335-15398
/gate/branches/sawdust/plugins:17055-17079
/gate/tags/release-7.0/plugins:15399-15407
-/gate/trunk/plugins:3-390
+/gate/trunk/plugins:3-390,18739
\ No newline at end of property
Modified: gate/branches/release-8.1/plugins/ANNIE/resources/gazetteer/bands.lst
===================================================================
--- gate/branches/release-8.1/plugins/ANNIE/resources/gazetteer/bands.lst
2015-06-01 19:54:23 UTC (rev 18739)
+++ gate/branches/release-8.1/plugins/ANNIE/resources/gazetteer/bands.lst
2015-06-01 22:55:48 UTC (rev 18740)
@@ -6,7 +6,7 @@
Eagles
U2
Aerosmith
-Genesis
+Genesis
Bee Gees
Dire Straits
Eminem
Modified:
gate/branches/release-8.1/plugins/ANNIE/resources/gazetteer/radio_stations_uk.lst
===================================================================
---
gate/branches/release-8.1/plugins/ANNIE/resources/gazetteer/radio_stations_uk.lst
2015-06-01 19:54:23 UTC (rev 18739)
+++
gate/branches/release-8.1/plugins/ANNIE/resources/gazetteer/radio_stations_uk.lst
2015-06-01 22:55:48 UTC (rev 18740)
@@ -17,7 +17,7 @@
Premier Radio
Smooth Radio UK
Talksport
-Team Rock Radio
+Team Rock Radio
UCB UK
Absolute Classic Rock
Absolute Radio 60s
Index:
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/Gaze.java
===================================================================
---
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/Gaze.java
2015-06-01 19:54:23 UTC (rev 18739)
+++
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/Gaze.java
2015-06-01 22:55:48 UTC (rev 18740)
Property changes on:
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/Gaze.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -1,6 +0,0 ##
-/gate/branches/cl-experiment/src/main/com/ontotext/gate/vr/Gaze.java:15466-15613
-/gate/branches/new-ontology-api/src/main/com/ontotext/gate/vr/Gaze.java:10584-11598
-/gate/branches/release-7.0/src/main/com/ontotext/gate/vr/Gaze.java:15335-15398
-/gate/branches/sawdust/src/main/com/ontotext/gate/vr/Gaze.java:17055-17079
-/gate/tags/release-7.0/src/main/com/ontotext/gate/vr/Gaze.java:15399-15407
-/gate/trunk/src/main/com/ontotext/gate/vr/Gaze.java:3-7
\ No newline at end of property
Index:
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/GeneralEditorException.java
===================================================================
---
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/GeneralEditorException.java
2015-06-01 19:54:23 UTC (rev 18739)
+++
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/GeneralEditorException.java
2015-06-01 22:55:48 UTC (rev 18740)
Property changes on:
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/GeneralEditorException.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -1,6 +0,0 ##
-/gate/branches/cl-experiment/src/main/com/ontotext/gate/vr/GeneralEditorException.java:15466-15613
-/gate/branches/new-ontology-api/src/main/com/ontotext/gate/vr/GeneralEditorException.java:10584-11598
-/gate/branches/release-7.0/src/main/com/ontotext/gate/vr/GeneralEditorException.java:15335-15398
-/gate/branches/sawdust/src/main/com/ontotext/gate/vr/GeneralEditorException.java:17055-17079
-/gate/tags/release-7.0/src/main/com/ontotext/gate/vr/GeneralEditorException.java:15399-15407
-/gate/trunk/src/main/com/ontotext/gate/vr/GeneralEditorException.java:3-7
\ No newline at end of property
Index:
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/MappingTreeView.java
===================================================================
---
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/MappingTreeView.java
2015-06-01 19:54:23 UTC (rev 18739)
+++
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/MappingTreeView.java
2015-06-01 22:55:48 UTC (rev 18740)
Property changes on:
gate/branches/release-8.1/plugins/Ontology_Tools/src/com/ontotext/gate/vr/MappingTreeView.java
___________________________________________________________________
Deleted: svn:mergeinfo
## -1,6 +0,0 ##
-/gate/branches/cl-experiment/src/main/com/ontotext/gate/vr/MappingTreeView.java:15466-15613
-/gate/branches/new-ontology-api/src/main/com/ontotext/gate/vr/MappingTreeView.java:10584-11598
-/gate/branches/release-7.0/src/main/com/ontotext/gate/vr/MappingTreeView.java:15335-15398
-/gate/branches/sawdust/src/main/com/ontotext/gate/vr/MappingTreeView.java:17055-17079
-/gate/tags/release-7.0/src/main/com/ontotext/gate/vr/MappingTreeView.java:15399-15407
-/gate/trunk/src/main/com/ontotext/gate/vr/MappingTreeView.java:3-7
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
