Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'

Conflicts:
	AUTHORS
	CMakeLists.txt
	ChangeLog
	INSTALL
	README
	aethyra.cbp
	configure.ac
	data/help/changes.txt
	data/help/commands.txt
	data/help/header.txt
	data/help/support.txt
	src/Makefile.am
	src/aethyra.rc
	src/being.cpp
	src/being.h
	src/equipment.cpp
	src/equipment.h
	src/floor_item.h
	src/game.cpp
	src/gui/buddywindow.cpp
	src/gui/char_select.cpp
	src/gui/char_server.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/equipmentwindow.cpp
	src/gui/equipmentwindow.h
	src/gui/gui.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/itemcontainer.h
	src/gui/minimap.cpp
	src/gui/ministatus.cpp
	src/gui/newskill.cpp
	src/gui/npc_text.cpp
	src/gui/npclistdialog.h
	src/gui/ok_dialog.cpp
	src/gui/setup_video.cpp
	src/gui/skill.cpp
	src/gui/skill.h
	src/gui/status.h
	src/gui/table_model.h
	src/gui/updatewindow.cpp
	src/gui/viewport.cpp
	src/inventory.cpp
	src/inventory.h
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/localplayer.h
	src/logindata.h
	src/main.cpp
	src/map.cpp
	src/monster.cpp
	src/monster.h
	src/net/beinghandler.cpp
	src/net/beinghandler.h
	src/net/buysellhandler.cpp
	src/net/equipmenthandler.cpp
	src/net/loginhandler.cpp
	src/net/loginhandler.h
	src/net/network.h
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/net/protocol.h
	src/net/tradehandler.cpp
	src/npc.cpp
	src/npc.h
	src/particleemitter.cpp
	src/particleemitterprop.h
	src/player.cpp
	src/player.h
	src/player_relations.cpp
	src/resources/imageset.cpp
	src/resources/imageset.h
	src/resources/itemdb.cpp
	src/resources/mapreader.cpp
	src/resources/monsterinfo.h
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h
	src/tileset.h
	src/utils/fastsqrt.h
	src/utils/strprintf.cpp
	src/winver.h
	tools/tmxcopy/Makefile
	tools/tmxcopy/base64.cpp
	tools/tmxcopy/base64.h
	tools/tmxcopy/tostring.h

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/INSTALL b/INSTALL
index 5e94f0ff..4124002d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,11 @@ Homepage:  http://www.aethyra.com/
 IRC:       irc.freenode.net / #aethyra
 
 1) Requirements
+<<<<<<< HEAD:INSTALL
 2) Compiling Aethyra
+=======
+2) Compiling And Installing The Mana World
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL
 3) Notes
 
 
@@ -26,8 +30,12 @@ a source release. To get Aethyra to compile, you need a compiler
 * zlib 1.2.x        http://www.gzip.org/zlib/
 * libcurl           http://curl.haxx.se/libcurl/
 
+<<<<<<< HEAD:INSTALL
 If you checked Aethyra out from Subversion you will also need these tools to
 compile:
+=======
+If you've cloned the Git repository, you will also need these tools to compile:
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL
 
 * GNU automake 1.9  http://www.gnu.org/software/automake/
 * GNU autoconf      http://www.gnu.org/software/autoconf/
@@ -40,7 +48,15 @@ you to figure this out.
 ===============================================
 
 1) Go to the directory you have extracted the source to.
+<<<<<<< HEAD:INSTALL
 2) If you checked out from SVN, run "./autobuild.sh" to install the client.
+=======
+2) If you've cloned the Git repository, run "autoreconf -i" to generate
+   configure and install any missing auxiliary files.
+3) Run "./configure"
+4) Run "make"
+5) Run "make install" as root
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL
 
 It should have installed Aethyra on your system now, and you can
 run it with "aethyra". By default all files are installed to /usr/local, you can