Merge lp://staging/~linuxjedi/libdrizzle/update-copyright-headers into lp://staging/libdrizzle
Proposed by
Andrew Hutchings
Status: | Merged |
---|---|
Approved by: | Andrew Hutchings |
Approved revision: | 108 |
Merged at revision: | 104 |
Proposed branch: | lp://staging/~linuxjedi/libdrizzle/update-copyright-headers |
Merge into: | lp://staging/libdrizzle |
Diff against target: |
948 lines (+206/-132) 54 files modified
docs/conf.py.in (+1/-1) libdrizzle-5.1/binlog.h (+1/-1) libdrizzle-5.1/column.h (+1/-0) libdrizzle-5.1/column_client.h (+1/-0) libdrizzle-5.1/conn.h (+1/-0) libdrizzle-5.1/conn_client.h (+1/-0) libdrizzle-5.1/constants.h (+1/-0) libdrizzle-5.1/drizzle.h (+1/-0) libdrizzle-5.1/drizzle_client.h (+1/-0) libdrizzle-5.1/error.h (+1/-1) libdrizzle-5.1/field_client.h (+1/-0) libdrizzle-5.1/libdrizzle.h (+1/-1) libdrizzle-5.1/query.h (+1/-0) libdrizzle-5.1/result.h (+1/-0) libdrizzle-5.1/result_client.h (+1/-0) libdrizzle-5.1/return.h (+1/-0) libdrizzle-5.1/row_client.h (+1/-0) libdrizzle-5.1/ssl.h (+1/-1) libdrizzle-5.1/statement.h (+1/-1) libdrizzle-5.1/structs.h (+1/-1) libdrizzle-5.1/verbose.h (+1/-0) libdrizzle-5.1/version.h.in (+1/-0) libdrizzle/binlog.cc (+1/-1) libdrizzle/binlog.h (+1/-1) libdrizzle/column.cc (+1/-0) libdrizzle/column.h (+1/-1) libdrizzle/command.cc (+1/-0) libdrizzle/common.h (+2/-0) libdrizzle/conn.cc (+1/-0) libdrizzle/conn_local.h (+1/-1) libdrizzle/conn_uds.cc (+1/-0) libdrizzle/datetime.h (+1/-1) libdrizzle/drizzle.cc (+1/-0) libdrizzle/drizzle_local.h (+1/-0) libdrizzle/error.cc (+1/-0) libdrizzle/field.cc (+1/-0) libdrizzle/handshake.cc (+1/-0) libdrizzle/handshake_client.h (+1/-0) libdrizzle/include.am (+1/-0) libdrizzle/pack.cc (+1/-0) libdrizzle/pack.h (+1/-0) libdrizzle/poll.cc (+1/-0) libdrizzle/poll.h (+1/-0) libdrizzle/query.cc (+1/-0) libdrizzle/result.cc (+1/-0) libdrizzle/result.h (+143/-0) libdrizzle/row.cc (+1/-0) libdrizzle/ssl.cc (+1/-1) libdrizzle/state.cc (+1/-0) libdrizzle/state.h (+1/-0) libdrizzle/statement_local.h (+1/-1) libdrizzle/statement_param.cc (+1/-1) libdrizzle/structs.h (+1/-100) tests/unit/connect_uds.c (+10/-17) |
To merge this branch: | bzr merge lp://staging/~linuxjedi/libdrizzle/update-copyright-headers |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Trunk | Pending | ||
Review via email: mp+145088@code.staging.launchpad.net |
Description of the change
Fixes Brian's merge conflict
To post a comment you must log in.