aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-26 21:23:55 +0000
committermarha <marha@users.sourceforge.net>2010-12-26 21:23:55 +0000
commit8f1afd266a69c5454dccf130e8522575c7aecae8 (patch)
treed647da44b8f803428e3217d54bd42d89e72fa803 /xorg-server
parentcc5b4c212b7c88026e8ebc5f3d82473149a040c5 (diff)
parentf28d4c94798d88757227b8c517a05a6ca354dc6f (diff)
downloadvcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.gz
vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.bz2
vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 2b474eb1b..44ccdba03 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -98,7 +98,7 @@ load_makefile ..\xkbcomp\makefile MAKESERVER=0 DEBUG=0
xkbcomp.exe: ..\xkbcomp\obj\release\xkbcomp.exe
copy $< $@
-%: ..\apps\xcalc\%.ad
+%: ..\apps\xcalc\app-defaults\%
copy $< $@
load_makefile ..\apps\xcalc\makefile MAKESERVER=0 DEBUG=0