summaryrefslogtreecommitdiffstats
path: root/src/util/units.cpp
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-07-17 05:31:18 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-07-17 05:31:18 +0000
commit63071dedd65d63cfac2041399dab0191e3753b42 (patch)
tree565d292941d7cd9e7a41225fbd63d85915d70076 /src/util/units.cpp
parentMerge from trunk. (diff)
downloadinkscape-63071dedd65d63cfac2041399dab0191e3753b42.tar.gz
inkscape-63071dedd65d63cfac2041399dab0191e3753b42.zip
Fixed botched merge.
(bzr r12380.1.18)
Diffstat (limited to 'src/util/units.cpp')
-rw-r--r--src/util/units.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/util/units.cpp b/src/util/units.cpp
index f6350d569..d485f6aef 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -196,11 +196,6 @@ int Unit::metric() const {
return 0;
}
-/**
- * Initializes the unit tables and identifies the primary unit types.
- *
- * The primary unit's conversion factor is required to be 1.00
- */
UnitTable::UnitTable()
{
// if we swich to the xml file, don't forget to force locale to 'C'