Commit (click to see the diff): 9bae2d4270b7efaab1d58137be59192d6e3c822f

merge

Arne Babenhauserheide

Diffstat

Änderung:        1055:9bae2d4270b7
Vorgänger:       1054:38c964fcf204
Vorgänger:       1052:dc7025a4ae23
Nutzer:          Arne Babenhauserheide 
Datum:           Tue Jul 28 13:21:13 2015 +0200
Zusammenfassung: merge

 guildhall-packages/newbase60/newbase60.scm |   0 
 guildhall-packages/newbase60/pkg-list.scm  |   2 +-
 wisp-guile.w                               |  23 +++++++++++++++++++++++
 wisp-scheme.w                              |  22 ++++++++++++++++++++++
 4 Dateien verändert, 46 Zeilen hinzugefügt(+), 1 Zeilen entfernt(-)

Files in this revision

• .bugs/bugs
• .bugs/details/4d4e76343fe09f0ec72a3e5eb0077bd16e12f9d5.txt
• .bugs/details/6749f3abcb9455eac9271efd8265797bce114239.txt
• .bugs/details/7a57614fa920b2ddad002d044b144d0bb7c34f84.txt
• .bugs/details/8cf6202873d4454f57813dd17cf60432059f7c62.txt
• .bugs/details/ce28d6c0d1f9894c9b946e56b17934473800edfe.txt
• .bugs/details/d6de2074a5017f1f29f34d142ce797981ed270a0.txt
• .bugs/details/d9147504868960e5fbc2648474d48ce5c9bd1a02.txt
• .hgsigs
• .hgtags
• AUTHORS
• Makefile.am
• NEWS
• README
• bootstrap.sh
• configure.ac
• docs/srfi-from-template.html
• docs/srfi-testsuite.html
• docs/srfi.html
• docs/srfi.org
• docs/ui/default/blank.gif
• docs/ui/default/bodybg.gif
• docs/ui/default/framing.css
• docs/ui/default/iepngfix.htc
• docs/ui/default/opera.css
• docs/ui/default/outline.css
• docs/ui/default/pretty.css
• docs/ui/default/print.css
• docs/ui/default/s5-core.css
• docs/ui/default/slides.css
• docs/ui/default/slides.js
• docs/ui/i18n/00_head.txt
• docs/ui/i18n/bg-shade.png
• docs/ui/i18n/bg-slide.jpg
• docs/ui/i18n/framing.css
• docs/ui/i18n/pretty.css
• docs/ui/i18n/s5-core.css
• docs/ui/i18n/slides.css
• docs/ui/jquery.js
• docs/ui/org-slides.js
• docs/why-wisp.org
• examples/Makefile
• examples/cli.w
• examples/comment-server.w
• examples/d20world.w
• examples/d6.w
• examples/ensemble-estimation.w
• examples/evolve.w
• examples/factorial.w
• examples/fib.w
• examples/fizzbuzz.w
• examples/hello-world-server.w
• examples/kit-encode.w
• examples/macros.w
• examples/map-product-sums.w
• examples/mercurial.w
• examples/multithreaded-magic.w
• examples/newbase60.w
• examples/property.w
• examples/string-replace-benchmark.w
• examples/tinyenc.c
• examples/tinyenc.w
• examples/unicode-math-fun.w
• examples/yinyang.w
• gpl.txt
• guildhall-packages/newbase60/newbase60.scm
• guildhall-packages/newbase60/pkg-list.scm
• testrunner.w
• tests/btest.scm
• tests/btest.w
• tests/continuation.scm
• tests/continuation.w
• tests/dotted-pair.scm
• tests/dotted-pair.w
• tests/emacs-customization-tex-master.scm
• tests/emacs-customization-tex-master.w
• tests/emacs-customization.scm
• tests/emacs-customization.w
• tests/example.scm
• tests/example.w
• tests/factorial.scm
• tests/factorial.w
• tests/flexible-parameter-list.scm
• tests/flexible-parameter-list.w
• tests/hello.scm
• tests/hello.w
• tests/linebreaks.scm
• tests/mtest.scm
• tests/mtest.w
• tests/namedlet.scm
• tests/namedlet.w
• tests/quotecolon.scm
• tests/quotecolon.w
• tests/range.scm
• tests/range.w
• tests/readable-tests.scm
• tests/readable-tests.w
• tests/runtests-scheme-preprocessor.sh
• tests/runtests-scheme-reader.sh
• tests/self-referencial.scm
• tests/self-referencial.w
• tests/shebang.scm
• tests/shebang.w
• tests/strangecomments.scm
• tests/strangecomments.w
• tests/sublist.scm
• tests/sublist.w
• tests/sxml.scm
• tests/sxml.w
• tests/syntax-colon.scm
• tests/syntax-colon.w
• tests/syntax-dot.scm
• tests/syntax-dot.w
• tests/syntax-empty.scm
• tests/syntax-empty.w
• tests/syntax-indent.scm
• tests/syntax-indent.w
• tests/syntax-strings-parens.scm
• tests/syntax-strings-parens.w
• tests/syntax-underscore.scm
• tests/syntax-underscore.w
• wisp-guile.w
• wisp-mode.el
• wisp-multiline.sh
• wisp-reader.w
• wisp-repl-guile.sh
• wisp-scheme.w
• wisp.py