* Merge from trunk

[inkscape.git] / src / display / nr-filter-composite.h

diff --git a/src/display/nr-filter-composite.h b/src/display/nr-filter-composite.h
index 72331f767d63708dbb62d72b0164a22c5b060d22..b2466653111a8bd86e2d646c9e32d6c55f90602c 100644 (file)
--- a/src/display/nr-filter-composite.h
+++ b/src/display/nr-filter-composite.h
@@ -16,9 +16,9 @@
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
-#include "libnr/nr-matrix.h"
 
-namespace NR {
+namespace Inkscape {
+namespace Filters {
 
 class FilterComposite : public FilterPrimitive {
 public:
@@ -40,7 +40,8 @@ private:
     int _input2;
 };
 
-} /* namespace NR */
+} /* namespace Filters */
+} /* namespace Inkscape */
 
 #endif /* __NR_FILTER_COMPOSITE_H__ */
 /*