ason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git log
commit 4e3d757b18e4154e899a256088d620ca67d71db3
Author: cinderweb <[email protected]>
Date:   Tue Sep 10 14:32:04 2013 -0500

    git reset HEAD world/map/npc/functions/paperboy.txt ->world/map/npc/function

commit 15b7bd9bac2163f5aa6fe39cc337d96b9c2da45d
Author: cinderweb <[email protected]>
Date:   Wed Sep 4 17:24:28 2013 -0500

    # This is a combination of 2 commits.
    # The first commit's message is:

    Added two new npc's to each of the town square to sell bi-weekly newspapers.

    # This is the 2nd commit message:

    edited so it isn't direct speech

commit 715daeb50afd6c0d6f822bf8bd2821677e3c41a5
Merge: 848ebd1 2f522ca
Author: Vincent Petithory <[email protected]>
Date:   Thu Aug 29 06:35:41 2013 -0700

    Merge pull request #26 from DinoPaskvan/master

    Small indentation fix on NPC Jack

commit 2f522ca18450f9dbaded273cc92ff6e78ca6fda7
Author: Dino Paskvan <[email protected]>
Date:   Thu Aug 29 15:03:22 2013 +0200

    Small indentation fix on NPC Jack

commit 848ebd19528918fba26f506468894ffa49b30dbd
Author: Ben Longbons <[email protected]>
Date:   Tue Aug 27 11:17:39 2013 -0700

    Pad names with _ instead of = to make it easier to detect merge conflicts

commit 373c6f13b1deed7e245e7447a4fc77f2fa75429f
Author: wushin <[email protected]>
Date:   Mon Aug 26 17:35:24 2013 -0500

    fixed item_db.txt for HEAD of TMWA

    Removed first line
    sed %s/\ ,\ /0,\ /g to fix empty values by ,

commit 24b2886d9a20f85e972e4e12c28cb2667675a474
Author: Vincent Petithory <[email protected]>
Date:   Mon Aug 26 23:30:41 2013 +0200

    Illia: adjust the alloted times after completing each step

commit dbdf7c4ddad4c69c5c8f55786cfe23ad233fc056
Author: tux9th <[email protected]>
Date:   Mon Aug 26 16:28:24 2013 +0200

    Updated submodule pointer.

commit 803b7fd5e4224276e5db57e8fa3d351d6529e80f
Merge: 36c6803 b3fc5b7
Author: Jessica Tölke <[email protected]>
Date:   Sun Aug 25 18:01:05 2013 +0200

    Merge remote-tracking branch 'origin/master' into waric

    Conflicts:
        world/map/db/item_db.txt

commit b3fc5b76efb0031277ad039d3f332b7c2b874d1c
Author: tux9th <[email protected]>
Date:   Thu Aug 22 23:02:51 2013 +0200

    run 'make maps' for client-data changes.

    update submodule pointer.

commit 79a6488356ef522fb2e37ff224f4b7c6194ca9e9
Author: Ben Longbons <[email protected]>
Date:   Tue Aug 20 09:39:17 2013 -0700

    Put Cindy messages in an array and use announcement formatting

commit ae194001586f5cc7dc680f56a1aed5c453c7e72d
Author: Ben Longbons <[email protected]>
Date:   Mon Aug 19 20:06:30 2013 -0700

    Give every NPC a unique name

commit e12af34ecdedca9a83e5bf8100e4bf721ec85697
Author: Ben Longbons <[email protected]>
Date:   Mon Aug 19 09:06:13 2013 -0700

    Move storage option to top of banker

    As suggested by Dyna.

commit e50a6c456829953f02ad68dd6e6a473c4a121dde
Author: Ben Longbons <[email protected]>
Date:   Mon Aug 19 09:04:09 2013 -0700

    Trivial removal of some trailing whitespace that snuck in

commit 89884ca46cf7d1def4fd19e97a846442fafdb38b
Author: tux9th <[email protected]>
Date:   Sun Aug 18 22:48:24 2013 +0200

    update submodule pointer.

commit 449c103ad4550c222edd3465cd83f9d1611a3310
Author: tux9th <[email protected]>
Date:   Sat Aug 17 11:52:49 2013 +0200

: