Merge branch 'master' into ossau-gds-dev

author Neil Jerram <neil@ossau.uklinux.net>

Sun, 8 Feb 2009 22:02:15 +0000 (22:02 +0000)

committer Neil Jerram <neil@ossau.uklinux.net>

Sun, 8 Feb 2009 22:02:15 +0000 (22:02 +0000)
author Neil Jerram <neil@ossau.uklinux.net>
Sun, 8 Feb 2009 22:02:15 +0000 (22:02 +0000)
committer Neil Jerram <neil@ossau.uklinux.net>
Sun, 8 Feb 2009 22:02:15 +0000 (22:02 +0000)
diff --cc .gitignore

index a455797,7644dea..6c0e62d
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -74,5 -74,4 +74,6 @@@ libguile/stack-limit-calibration.sc
   cscope.out
   cscope.files
   *.log
+ +gds-test.debug
+ +gds-test.transcript
+ INSTALL
diff --cc THANKS
Simple merge
author	Neil Jerram <neil@ossau.uklinux.net>
	Sun, 8 Feb 2009 22:02:15 +0000 (22:02 +0000)
committer	Neil Jerram <neil@ossau.uklinux.net>
	Sun, 8 Feb 2009 22:02:15 +0000 (22:02 +0000)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
THANKS	patch \|	diff1 \|	diff2 \|	blob \| history