From a96d570a24bc89c25d9459d08f2194cb42ad062f Mon Sep 17 00:00:00 2001 From: Michael Kohlhase <michael.kohlhase@fau.de> Date: Tue, 29 Jan 2019 14:27:09 +0100 Subject: [PATCH] git subrepo pull (merge) lib/kbibs subrepo: subdir: "lib/kbibs" merged: "603e91b5" upstream: origin: "git@github.com:KWARC/bibs.git" branch: "master" commit: "14704f24" git-subrepo: version: "0.4.0" origin: "git@github.com:ingydotnet/git-subrepo.git" commit: "5d6aba9" --- lib/kbibs/.gitrepo | 2 +- lib/kbibs/extpubs.bib | 8 ++++++++ lib/kbibs/kwarc.bib | 13 +++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/kbibs/.gitrepo b/lib/kbibs/.gitrepo index 97941d1..13a0fcf 100644 --- a/lib/kbibs/.gitrepo +++ b/lib/kbibs/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:KWARC/bibs.git branch = master - commit = f21adc164bf14abf3f715018baeaecaba1f571e0 + commit = 14704f24d2c70910f251f21f59e4d4c1a34d57ed parent = 38bdd47fc690489d66053314060d031a07730161 method = merge cmdver = 0.4.0 diff --git a/lib/kbibs/extpubs.bib b/lib/kbibs/extpubs.bib index 85e3dc3..b8554ba 100644 --- a/lib/kbibs/extpubs.bib +++ b/lib/kbibs/extpubs.bib @@ -508,6 +508,14 @@ abstract="Manifest fields in a type of modules are shown to be expressible in in isbn="978-3-642-02444-3" } +@ARTICLE{Liskov94abehavioral, + author = {Barbara H. Liskov and Jeanette M. Wing}, + title = {A Behavioral Notion of Subtyping}, + journal = {ACM Transactions on Programming Languages and Systems}, + year = {1994}, + volume = {16}, + pages = {1811--1841} +} @online{gloin:on,crossref={gloin:base}, label = {GLO}, diff --git a/lib/kbibs/kwarc.bib b/lib/kbibs/kwarc.bib index 611ad0f..3acfde3 100644 --- a/lib/kbibs/kwarc.bib +++ b/lib/kbibs/kwarc.bib @@ -60,6 +60,11 @@ @STRING{spring = "Springer-Verlag"} @STRING{JWS = {Web Semantics: Science, Services and Agents on the World Wide Web}} +@online{cocalc:on, + label = {CC}, + title = {{CoCalc}: Collaborative Calculation in the Cloud}, + url = {https://cocalc.com}, + urldate = {2019-01-28}} @online{wikidata:on, label = {WD}, title = {Wikidata:Introduction}, @@ -551,6 +556,14 @@ abstract="Manifest fields in a type of modules are shown to be expressible in in isbn="978-3-642-02444-3" } +@ARTICLE{Liskov94abehavioral, + author = {Barbara H. Liskov and Jeanette M. Wing}, + title = {A Behavioral Notion of Subtyping}, + journal = {ACM Transactions on Programming Languages and Systems}, + year = {1994}, + volume = {16}, + pages = {1811--1841} +} @online{gloin:on,crossref={gloin:base}, label = {GLO}, -- GitLab