From ebade6105b9ebb0f6078886c2f52db7fbd0f0bf5 Mon Sep 17 00:00:00 2001
From: Lucas GAUTHERON <lucas.gautheron@gmail.com>
Date: Fri, 22 Mar 2013 20:09:34 +0000
Subject: [PATCH] changelog update

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7385 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 changelog.txt       | 1 +
 source/src/Makefile | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index f768f9a7..e05b0a0b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -64,6 +64,7 @@ Server browser
 Media (maps/textures/models)
 ---------------------
 
+[*] Ability to download maps, textures, mapmodels on the fly when they're missing
 [*] New map "ac_avenue"
 [*] New map "ac_cavern"
 [*] New map "ac_edifice"
diff --git a/source/src/Makefile b/source/src/Makefile
index db90f40c..1ba1442d 100644
--- a/source/src/Makefile
+++ b/source/src/Makefile
@@ -157,7 +157,6 @@ else
 client: libenet $(CLIENT_OBJS)
 	$(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
 
-server: libenet $(SERVER_OBJS)
 server: libenet $(SERVER_OBJS)
 	$(CXX) $(CXXFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
 master: libenet $(MASTER_OBJS)