summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-08-10 15:46:59 (UTC)
committer mickeyl <mickeyl>2003-08-10 15:46:59 (UTC)
commit0024cf8df3d576ac4fa5921b041d0fdbd17079e1 (patch) (unidiff)
treed5f27d29d086d88ef7b1cb2410acbf1e215e0e21
parent47dd125c01d6d95d5f3e248cc990d00fdcffc5f8 (diff)
downloadopie-0024cf8df3d576ac4fa5921b041d0fdbd17079e1.zip
opie-0024cf8df3d576ac4fa5921b041d0fdbd17079e1.tar.gz
opie-0024cf8df3d576ac4fa5921b041d0fdbd17079e1.tar.bz2
BUILDFIX: merge overwrote my fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/usermanager/usermanager.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 1baccb6..576a233 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -3,5 +3,5 @@ TEMPLATE = app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h 4 HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h
5 SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.h main.cpp 5 SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp
6 INCLUDEPATH+= $(OPIEDIR)/include 6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include