Merge lp:~brianaker/drizzle/982799 into lp:drizzle/7.1
Proposed by
Brian Aker
Status: | Merged |
---|---|
Approved by: | Brian Aker |
Approved revision: | 2537 |
Merged at revision: | 2539 |
Proposed branch: | lp:~brianaker/drizzle/982799 |
Merge into: | lp:drizzle/7.1 |
Diff against target: |
280 lines (+113/-33) 11 files modified
Makefile.am (+1/-0) configure.ac (+2/-20) drizzled/drizzled.cc (+31/-7) libdrizzle-1.0/drizzle_client.h (+1/-0) libdrizzle-1.0/include.am (+1/-0) libdrizzle-1.0/version.h.in (+41/-0) libdrizzle/drizzle.cc (+1/-1) m4/libdrizzle_version.m4 (+30/-0) support-files/drizzle.pc.in (+1/-1) support-files/libdrizzle-1.0.pc.in (+2/-2) support-files/libdrizzle.pc.in (+2/-2) |
To merge this branch: | bzr merge lp:~brianaker/drizzle/982799 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Trunk | Pending | ||
Review via email: mp+102060@code.launchpad.net |
To post a comment you must log in.