Current News
Archived News
Search News
Discussion Forum


Old Forum
Install Programs More Downloads...
Troubleshooting
Source Code
Format Specs.
Misc. Information
Non-SF Stuff
Links




authorShadowFlare <blakflare@hotmail.com>
Sun, 4 Jul 2010 23:01:31 +0000 (17:01 -0600)
committerShadowFlare <blakflare@hotmail.com>
Sun, 4 Jul 2010 23:01:31 +0000 (17:01 -0600)
commit033f7f171bfdddc8a0db52fd03f932792c26f2dd
treebdcff634505f4c524656f15263ec3db0595b4fb9
parent212e7d696e798215d4cddfcb5007c212814728e6
parentcd5a40ab4404ee1b938562561d9f9a40dd3dab75
Merge branch 'master' into large_archive

Resolved conflicts:
SFmpqapi.cpp
SFmpqapi.cpp
SFmpqapi.h