← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/authorization.h

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/authorization.h
22
22
#ifndef DRIZZLED_PLUGIN_AUTHORIZATION_H
23
23
#define DRIZZLED_PLUGIN_AUTHORIZATION_H
24
24
 
25
 
#include "drizzled/plugin.h"
26
 
#include "drizzled/plugin/plugin.h"
27
 
#include "drizzled/identifier.h"
 
25
#include <drizzled/plugin.h>
 
26
#include <drizzled/plugin/plugin.h>
 
27
#include <drizzled/identifier.h>
28
28
 
29
29
#include <string>
30
30
#include <set>
31
31
 
32
 
#include "drizzled/visibility.h"
 
32
#include <drizzled/visibility.h>
33
33
 
34
34
namespace drizzled
35
35
{