← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/replication_services.cc

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/replication_services.cc
49
49
#include "drizzled/message/table.pb.h"
50
50
#include "drizzled/gettext.h"
51
51
#include "drizzled/session.h"
52
 
#include "drizzled/plugin_registry.h"
 
52
#include "drizzled/plugin/registry.h"
53
53
 
54
54
#include <vector>
55
55