Viewing all changes in revision 2555.1.1.
- Committer: Brian Aker
- Date: 2012-05-19 20:56:34 UTC
- mfrom: (2539.4.5 drizzle-bug-951788)
- mto: This revision was merged to the branch mainline in revision 2556.
- Revision ID: brian@tangent.org-20120519205634-61pslme8ixizdviv
Merge conflict fix.
- files modified:
- client/server_detect.cc
expand all
collapse all
added
removed
