Fixed typo in old Linux encoder makefile
Merge branch 'master' of https://github.com/ethanhugg/openh264 into cosmetic
Merge branch 'master' of https://github.com/ethanhugg/openh264 into cosmetic
Updated CONTRIBUTORS file
Merge pull request #79 from ethanhugg/cosmetic

Updated CONTRIBUTORS file
Don't use include guards with leading underscores

Defines with leading underscores are reserved.

This fixes issue #10.
Merge pull request #82 from mstorsjo/include-guards

Don't use include guards with leading underscores
README.md: Formatting
1. fix gcc 3.4 link error.
2. fix mingw build issue when enable asm
Merge pull request #90 from ruil2/new_request

fix mingw build issue
Merge pull request #89 from RichiH/patch-1

README.md: Formatting
resolve conflict
merge VS2012 makefile for 64bits assembly
fix merge conflict
Merge pull request #93 from volvet/64bits_Support

64bits support for assembly codes.
Merge pull request #80 from ethanhugg/othercontribs

Fixed typo in old Linux encoder makefile