Thread: npgsql - Npgsql2: Redo merge.

npgsql - Npgsql2: Redo merge.

From
talliesin@pgfoundry.org (User Talliesin)
Date:
Log Message:
-----------
Redo merge.

Modified Files:
--------------
    Npgsql2/src:
        .cvsignore (r1.2 -> r1.3)
        (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/.cvsignore.diff?r1=1.2&r2=1.3)
        Npgsql.csproj (r1.10 -> r1.11)
        (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql.csproj.diff?r1=1.10&r2=1.11)
    Npgsql2/src/Npgsql:
        NpgsqlCommand.cs (r1.18 -> r1.19)
        (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/NpgsqlCommand.cs.diff?r1=1.18&r2=1.19)
        NpgsqlConnection.cs (r1.16 -> r1.17)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/NpgsqlConnection.cs.diff?r1=1.16&r2=1.17)
        NpgsqlParameter.cs (r1.12 -> r1.13)
        (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/NpgsqlParameter.cs.diff?r1=1.12&r2=1.13)
    Npgsql2/src/Npgsql/SqlGenerators:
        SqlBaseGenerator.cs (r1.3 -> r1.4)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/SqlGenerators/SqlBaseGenerator.cs.diff?r1=1.3&r2=1.4)
        SqlDeleteGenerator.cs (r1.3 -> r1.4)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/SqlGenerators/SqlDeleteGenerator.cs.diff?r1=1.3&r2=1.4)
        SqlInsertGenerator.cs (r1.3 -> r1.4)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/SqlGenerators/SqlInsertGenerator.cs.diff?r1=1.3&r2=1.4)
        SqlSelectGenerator.cs (r1.3 -> r1.4)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/SqlGenerators/SqlSelectGenerator.cs.diff?r1=1.3&r2=1.4)
        SqlUpdateGenerator.cs (r1.3 -> r1.4)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/SqlGenerators/SqlUpdateGenerator.cs.diff?r1=1.3&r2=1.4)
        VisitedExpression.cs (r1.3 -> r1.4)

(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/npgsql/Npgsql2/src/Npgsql/SqlGenerators/VisitedExpression.cs.diff?r1=1.3&r2=1.4)