Merge branch 'master' into dev_properties_side_bar

This commit is contained in:
jfmcarreira committed 2014-04-13 13:08:03 +01:00
commit ef6d3ece54
10 files changed
+151 -64

No files matched your search

+5
View File
@@ -146,6 +146,11 @@ typedef struct __pixel_definition
};
}Pixel;
enum eTool
{
NavigationTool, NormalSelectionTool, BlockSelectionTool, MaskTool, EraserTool
};
} // NAMESPACE
#endif // __TYPEDEF_H__