fix switching between column and other formations

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14358 3db68df2-c116-0410-a063-a993310a9797


git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14359 3db68df2-c116-0410-a063-a993310a9797
Added new Ptolemies track to the Ptolemies civ json.

Removed fishing from land units. However, they still try to go fish after building a dock. Looks like it needs a deeper fix.

Portrait for Ptol camel archer.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14361 3db68df2-c116-0410-a063-a993310a9797
fix the fish gatherer from r14361

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14362 3db68df2-c116-0410-a063-a993310a9797
Fix bug in ipstamp module.
Sync with server. Refs #2307.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14363 3db68df2-c116-0410-a063-a993310a9797
Automated build.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14364 3db68df2-c116-0410-a063-a993310a9797
Fixes OS X libs build script

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14365 3db68df2-c116-0410-a063-a993310a9797
Change bot name.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14366 3db68df2-c116-0410-a063-a993310a9797
Merge 'remotes/trunk'