brianjlowe 5c14c1355d Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf ... Conflicts: productMods/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl productMods/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl productMods/WEB-INF/filegraph/tbox/scires-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-core-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-event-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl productMods/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl productMods/WEB-INF/ontologies/update/oldVersion/isDefinedBy-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/scires-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-bibo-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-c4o-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-core-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcelements-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcterms-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-event-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-fabio-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-foaf-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-pws-1.5.owl productMods/WEB-INF/ontologies/update/oldVersion/vivo-skos-1.5.owl productMods/templates/freemarker/body/partials/individual/individual-positions.ftl rdf/abox/filegraph/us-states.rdf rdf/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl rdf/tbox/filegraph/isDefinedBy-1.5.owl rdf/tbox/filegraph/scires-1.5.owl rdf/tbox/filegraph/vivo-bibo-1.5.owl rdf/tbox/filegraph/vivo-c4o-1.5.owl rdf/tbox/filegraph/vivo-core-1.5.owl rdf/tbox/filegraph/vivo-dcelements-1.5.owl rdf/tbox/filegraph/vivo-dcterms-1.5.owl rdf/tbox/filegraph/vivo-event-1.5.owl rdf/tbox/filegraph/vivo-fabio-1.5.owl rdf/tbox/filegraph/vivo-foaf-1.5.owl rdf/tbox/filegraph/vivo-pws-1.5.owl rdf/tbox/filegraph/vivo-skos-1.5.owl		2013-09-10 09:09:42 -04:00
..
filegraph	Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf	2013-09-10 09:09:42 -04:00
firsttime	updates for concept search and label management	2013-09-05 15:45:49 -04:00