diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2008-06-22 03:49:00 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2008-06-22 03:49:00 +0000 |
| commit | aef141460e6e78adb35e8bf4d39dcf4e2a4efebc (patch) | |
| tree | 59eb056b015f562b636420fd4b9a4e348831c45b /src/Makefile_insert | |
| parent | patch 241565 (diff) | |
| download | inkscape-aef141460e6e78adb35e8bf4d39dcf4e2a4efebc.tar.gz inkscape-aef141460e6e78adb35e8bf4d39dcf4e2a4efebc.zip | |
* src/2geom/isnan.h, src/libcola/cola.cpp, src/style.cpp, src/seltrans.cpp,
src/libcola/gradient_projection.cpp, src/libvpsc/generate-constraints.cpp,
src/libnr/nr-types.cpp, src/libnr/nr-point-fns-test.cpp, src/isnan.h,
src/libnr/nr-point-fns.cpp, src/libnr/in-svg-plane-test.cpp,
src/doxygen-main.cpp, src/display/nr-filter-composite.cpp,
src/display/nr-filter-merge.cpp, src/display/nr-filter-gaussian.cpp,
src/display/bezier-utils.cpp, src/Makefile_insert, src/eraser-context.cpp,
src/dyna-draw-context.cpp, src/tweak-context.cpp, src/sp-namedview.cpp,
src/libnr/in-svg-plane-test.h, src/libnr/nr-point-fns-test.h,
src/mod360-test.h, src/CMakeLists.txt, src/2geom/linear.h:
Properly fix the conflicting isnan.h problem:
1) Update src/2geom/isnan.h to match newest Inkscape src/isnana.h
(Also commited this change to lib2geom project repository)
2) Remove Inkscape's src/isnan.h
3) Update all files to include src/2geom/isnan.h instead of src/isnan.h
(bzr r6013)
Diffstat (limited to 'src/Makefile_insert')
| -rw-r--r-- | src/Makefile_insert | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile_insert b/src/Makefile_insert index 786322574..033d27810 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -92,7 +92,7 @@ libinkpre_a_SOURCES = \ inkscape-stock.cpp inkscape-stock.h\ inkscape.cpp inkscape.h inkscape-private.h \ interface.cpp interface.h \ - isnan.h isinf.h \ + isinf.h \ isnormal.h \ knot-enums.h \ knot-holder-entity.h knot-holder-entity.cpp \ |