• bbr's avatar
    small conflicts merged · 2c0797cc
    bbr authored
    Merge branch 'gui' into oracle
    
    Conflicts:
    
    	src/lib/All_Libraries.curry
    	src/lib/ExternalFunctionsIO.hs
    	src/lib/ExternalFunctionsPrelude.hs
    	src/lib/IO.curry
    2c0797cc
ExternalFunctionsSocket.hs 1.62 KB