]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76df60a 81190c6)
Merge pull request #288 in FS/freeswitch from ~MICHAELGG/freeswitch:winperf to master
authorMike Jerris <mike@jerris.com>
Thu, 18 Jun 2015 20:35:02 +0000 (15:35 -0500)
committerMike Jerris <mike@jerris.com>
Thu, 18 Jun 2015 20:35:02 +0000 (15:35 -0500)
* commit '81190c6d89aa7bedbda041c8a8519081856effff':
  FS-7644. Fix build on VS2013/Win by creating and forcing nf (nofork) to true.
  FS-7644. Remove non-existent projects.
  FS-7644. Add switch_core_video.c and switch_vidderbuffer.c to VS2013 FreeSwitchCore.2013.vcxproj
  FS-7644. Change 2013.vcxproj references to 2013


Trivial merge
Mirror of https://github.com/signalwire/freeswitch.git