litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
vivo/rdf/tbox/filegraph
History
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
..
agent.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
appControls-temp.n3 Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
bfo-bridge.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
bfo.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
clinical.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
contact-vcard.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
contact.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
data-properties.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
date-time.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
dateTimeValuePrecision.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
documentStatus.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
education.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
event.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
geo-political.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
grant.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
linkSuppression.n3 Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
location.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
object-properties.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
object-properties2.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
other.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
outreach.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
personTypes.n3 Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
process.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
publication.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
relationship.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
research-resource-iao.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
research-resource.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
research.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
role.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
service.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
skos-vivo.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
teaching.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00
vitroPublic.owl Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf 2013-09-10 09:09:42 -04:00