Skip to content

Commit

Permalink
Merge git://github.com/stump/fofix into fofix_nhBranch
Browse files Browse the repository at this point in the history
  • Loading branch information
erodozer committed Jul 10, 2010
2 parents 70e46e5 + 8709f47 commit 73cb9d6
Show file tree
Hide file tree
Showing 23 changed files with 259 additions and 1,854 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*.py[cod]
*.exe
*.dll
doc/doxygen
doc/epydoc
src/*.ini
src/*.log
data/library.zip
Expand Down
21 changes: 10 additions & 11 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ Nicholas Hydock (Blazingamer)
Harris Worthington (Qstick)
Tom Skinner (akedrou)
John Stumpo (stump)
volshebnyi
Worldrave
maxx.h2

=%pastCoders%=
`%noOrder%`
Expand Down Expand Up @@ -62,7 +60,7 @@ Anton Tamminen

=%Team Hero%=
`%careerMode%`
Lsapg09, Jrdnxxhero, Blackfriday, blessedmain911, ADH,
Lsapg09, Jrdnxxhero, Blackfriday, blessedmain911, ADH,
razlo7, coolguy5678, arfn24, Qwedgeonline

=%honorary%=
Expand All @@ -86,8 +84,8 @@ Bluto ($10.00)
Anonymous ($8.00)
SmashD ($7.50)
Simon Lemaire, Ryan Turcotte, Ethd,
BorisDSP, ForFretsSake,
Tynam, Noel Varelas,
BorisDSP, ForFretsSake,
Tynam, Noel Varelas,
and christcenteredgamer.com ($5.00)
kirbix ($3.00)
James Subrecky ($2.50)
Expand All @@ -101,19 +99,20 @@ Lysdestic

=%other%=
`%noOrder%`
Aduro, blessedmain911, Chadman, Divra, Evil Ken, FoZZ,
Aduro, blessedmain911, Chadman, Divra, Evil Ken, FoZZ,
Kookoz, Inkk, Meteorito, Pudding, Racer 13, Raph666,
RavenSourcious, Seraph88, TXF, v4vendetta, YMS,
Figure, anthman852, Happ E Nose, Death Au, jnuz,
italiansta1ion, lsapg09, fuzion, rubjonny, slantyr,
Tpyn, cama, kingleonidas, MoonFlow43, evil-doer,
Tpyn, cama, kingleonidas, MoonFlow43, evil-doer,
D4rksh4d0w, bluzer, MistTribe, faaa, ugo247548 (Biskit),
jacobo123, mrhoeivo, sherranjjj001, JcFerggy, iamnoob,
jacobo123, mrhoeivo, sherranjjj001, JcFerggy, iamnoob,
Death Legion, kawaii_kumiko69, gamexprt1, acrox999,
p_025, treckzy, slash666, mrhoievo, Dillusional,
SneakHouse, Borisdsp, Don Tonberry, Gugered,
p_025, treckzy, slash666, mrhoievo, Dillusional,
SneakHouse, Borisdsp, Don Tonberry, Gugered,
NewCreature, rock8200, Leixner, Trinidude4, ver,
evilbobthebob, deufeufeu, Steven Knapman
evilbobthebob, deufeufeu, Steven Knapman,
volshebnyi, maxx.h2

_%tutorial%_
=======================================================
Expand Down

0 comments on commit 73cb9d6

Please sign in to comment.