Updating to current trunk

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

diff --git a/src/display/nr-filter-merge.h b/src/display/nr-filter-merge.h
index 14c16a27a007fcc93c7c23b897c31a746e85e191..b7737e34717df11441ba40ead1f59ffd477b17f0 100644 (file)
--- a/src/display/nr-filter-merge.h
+++ b/src/display/nr-filter-merge.h
@@ -19,7 +19,8 @@
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 
-namespace NR {
+namespace Inkscape {
+namespace Filters {
 
 class FilterMerge : public FilterPrimitive {
 public:
@@ -36,7 +37,8 @@ private:
     std::vector<int> _input_image;
 };
 
-} /* namespace NR */
+} /* namespace Filters */
+} /* namespace Inkscape */
 
 #endif /* __NR_FILTER_MERGE_H__ */
 /*