]> git.sesse.net Git - casparcg/commitdiff
projects / casparcg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a95f6d8 fec3b7e)
Merge branch 'master' of https://github.com/CasparCG/Server
authorRobert Nagy <ronag@live.com>
Sat, 9 Nov 2013 21:40:29 +0000 (22:40 +0100)
committerRobert Nagy <ronag@live.com>
Sat, 9 Nov 2013 21:40:29 +0000 (22:40 +0100)
1  2 
casparcg.sln patch | diff1 | diff2 | blob | history

diff --cc casparcg.sln
Simple merge
Unnamed repository; edit this file 'description' to name the repository.