Clone
Gustaf Neumann <neumann@wu-wien.ac.at>
committed
on 14 Oct 11
Merge branch '2.0.0-develop'
Conflicts:
.gitignore
ChangeLog
Makefile.in
apps/xml/rdfExample.xotcl
apps/xml/xmlExample.xotcl
config/mk… Show more
Merge branch '2.0.0-develop'

Conflicts:

        .gitignore

        ChangeLog

        Makefile.in

        apps/xml/rdfExample.xotcl

        apps/xml/xmlExample.xotcl

        config/mktar.sh

        configure

        configure.in

        doc/index.html

        doc/langRef-xotcl.pdf

        doc/tutorial.pdf

        doc/xo-daemon.html

        doc/xo-whichPkg.html

        generic/predefined.h

        generic/predefined.xotcl

        generic/xotcl.c

        generic/xotcl.decls

        generic/xotcl.h

        generic/xotclAccessInt.h

        generic/xotclAppInit.c

        generic/xotclDecls.h

        generic/xotclError.c

        generic/xotclInt.decls

        generic/xotclInt.h

        generic/xotclMetaData.c

        generic/xotclProfile.c

        generic/xotclShadow.c

        generic/xotclStubInit.c

        generic/xotclStubLib.c

        generic/xotclTrace.c

        generic/xotclUtil.c

        library/lib/changeNextVersion

        library/lib/make.xotcl

        library/lib/pkgIndex.tcl

        library/lib/test.xotcl

        library/lib/upvarcompat.xotcl

        library/mongodb/tcl.m4

        library/rdf/COPYRIGHT

        library/rdf/rdfExample.xotcl

        library/registry/COPYRIGHT

        library/serialize/Serializer.xotcl

        library/store/COPYRIGHT

        library/xml/COPYRIGHT

        library/xml/xmlExample.xotcl

        library/xotcl/apps/comm/webserver.xotcl

        library/xotcl/doc/langRef.xotcl

        library/xotcl/doc/tutorial.html

        library/xotcl/library/lib/makeDoc.xotcl

        library/xotcl/library/rdf/rdfExample.xotcl

        library/xotcl/library/store/XOTclGdbm/configure

        library/xotcl/library/store/XOTclGdbm/configure.in

        library/xotcl/library/store/XOTclSdbm/Makefile

        library/xotcl/library/store/XOTclSdbm/configure

        library/xotcl/library/store/XOTclSdbm/configure.in

        library/xotcl/library/store/XOTclSdbm/tcl.m4

        library/xotcl/library/xml/TclExpat-1.1/Makefile

        library/xotcl/library/xml/TclExpat-1.1/configure

        library/xotcl/library/xml/TclExpat-1.1/configure.in

        library/xotcl/library/xml/TclExpat-1.1/tcl.m4

        library/xotcl/library/xml/xmlExample.xotcl

        library/xotcl/tests/UNIVERSAL.test

        library/xotcl/tests/actiweb.test

        library/xotcl/tests/persistence.test

        library/xotcl/tests/slottest.xotcl

        library/xotcl/tests/speedtest.xotcl

        library/xotcl/tests/testo.xotcl

        library/xotcl/tests/testx.xotcl

        library/xotcl/tests/xoRDF.test

        library/xotcl/tests/xocomm.test

        tcl.m4

        tests/forwardtest.xotcl

        unix/tclAppInit.c

        unix/tkAppInit.c

        win/rc/xotcl.rc

        win/winMain.c

        xotcl.m4

Show less