summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInari Listenmaa <inari.listenmaa@gmail.com>2017-06-29 20:14:32 +0200
committerInari Listenmaa <inari.listenmaa@gmail.com>2017-06-29 20:14:32 +0200
commit899dba88b7fdde748cc10443b3d0fdb3584874e4 (patch)
treeefcf3aaf8673e71ec6a251a4a90d86408065d67c
parent3464e912c11be114ca9694f896746feb0c9ea42c (diff)
parentff82b0980bc7912ab8d79ebc4428c87e58109f2d (diff)
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
-rw-r--r--gf.cabal9
-rw-r--r--index.html4
2 files changed, 9 insertions, 4 deletions
diff --git a/gf.cabal b/gf.cabal
index 966153d1c..669035a92 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -42,10 +42,13 @@ data-files: tools/gf.el
www/translator/*.css
www/translator/*.js
-source-repository head
- type: darcs
- location: http://www.grammaticalframework.org/
+--source-repository head
+-- type: darcs
+-- location: http://www.grammaticalframework.org/
+source-repository head
+ type: git
+ location: https://github.com/GrammaticalFramework/GF.git
flag interrupt
Description: Enable Ctrl+Break in the shell
diff --git a/index.html b/index.html
index 51954f730..182033787 100644
--- a/index.html
+++ b/index.html
@@ -46,7 +46,8 @@ function sitesearch() {
<ul>
<li><A HREF="http://groups.google.com/group/gf-dev">User Group</A>
- <li><a href="http://code.google.com/p/grammatical-framework/issues/list">Bug Reports</a>
+ <li><a href="https://github.com/GrammaticalFramework/GF/issues">Bug Reports</a>
+ (<a href="http://code.google.com/p/grammatical-framework/issues/list">old</a>)
<li><a href="http://grammatical-framework.blogspot.com/">Blog</a>
</ul>
</div>
@@ -119,6 +120,7 @@ document.write('<div style="float: right; margin-top: 3ex;"> <form onsubmit="re
<div class=news2>
<table class=news>
+<tr><td>2017-06-29:<td>GF is moving to <a href="https://github.com/GrammaticalFramework/GF/">GitHub</a>!
<tr><td>2017-03-13:<td><strong>GF Summer School in Riga (Latvia), 14-25 August 2017</strong>
<a href="http://school.grammaticalframework.org/2017/">Summer
School web page</a>.