Viewing all changes in revision 2556.
- Committer: Continuous Integration
- Date: 2012-05-19 21:06:47 UTC
- mfrom: (2555.1.1 drizzle-7.2)
- Revision ID: ci@drizzle.org-20120519210647-qyqvfqo0gszqirys
modified:
client/server_detect.cc
pending merge tips: (use -v to see all merge revisions)
Brian Aker 2012-05-19 [merge] Merge conflict fix.
client/server_detect.cc
pending merge tips: (use -v to see all merge revisions)
Brian Aker 2012-05-19 [merge] Merge conflict fix.
- files modified:
- client/server_detect.cc
expand all
collapse all
added
removed
