John J. Camilleri e6d8b76dbf Merge branch 'majestic' of github.com:GrammaticalFramework/gf-core into majestic ...

# Conflicts:
#	src/runtime/python/pypgf.c

2021-09-06 23:52:30 +02:00

..

compiler

Merge branch 'master' into c-runtime

2021-07-30 11:20:04 +02:00

programs

Rename src/programs/gf.hs to gf-main.hs to avoid confusing GHC

2014-10-16 15:21:00 +00:00

runtime

Merge branch 'majestic' of github.com:GrammaticalFramework/gf-core into majestic

2021-09-06 23:52:30 +02:00

server

Merge branch 'master' into c-runtime

2021-07-30 11:20:04 +02:00

tools

First attempt at fixing incompabilities with newer cabal

2020-08-05 18:48:24 +02:00

www

added link to vis-network.min.js

2021-07-26 16:57:05 +02:00