summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-06 10:57:16 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-06 10:57:16 -0700
commitb3490213f42ed63bc4b05b37bcfc12809f2d432c (patch)
treed56ede6f1ea8d20c2120eba2b9ca705927a77913 /Makefile
parent92d8978ab4ad980397883b50d0e7bc81d2bf5f73 (diff)
parent70352c3962cf3b4379590326cdc489ac0543f7e9 (diff)
downloadsubsurface-b3490213f42ed63bc4b05b37bcfc12809f2d432c.tar.gz
Merge branch 'glib-removal-hack'
Fix obvious merge issue in Rules.mk Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5fac71f59..5c44073a8 100644
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,7 @@ SOURCES = \
uemis.c \
uemis-downloader.c \
libdivecomputer.c \
+ gettextfromc.cpp \
qthelper.cpp \
qt-ui/simplewidgets.cpp \
qt-ui/tableview.cpp \