Merge branch 'Gtk' into Gtk-Screen
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 14 Jun 2013 17:37:12 +0000 (10:37 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 14 Jun 2013 17:37:12 +0000 (10:37 -0700)
26 files changed:
1  2 
src/Setup.sh
src/configure.ac
src/edwin/buffrm.scm
src/edwin/bufwfs.scm
src/edwin/bufwin.scm
src/edwin/bufwiu.scm
src/edwin/editor.scm
src/edwin/edtfrm.scm
src/edwin/edwin.pkg
src/edwin/edwin.sf
src/edwin/image.scm
src/edwin/input.scm
src/edwin/make.scm
src/edwin/modwin.scm
src/edwin/os2term.scm
src/edwin/process.scm
src/edwin/screen.scm
src/edwin/simple.scm
src/edwin/tterm.scm
src/edwin/utlwin.scm
src/edwin/win32.scm
src/edwin/xterm.scm
src/etc/create-makefiles.sh
src/etc/optiondb.scm
src/runtime/thread.scm
tests/check.scm

diff --cc src/Setup.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tests/check.scm
Simple merge