]> git.vomp.tv Git - vompclient-marten.git/commit
Merge branch '0-4-1-dev' of http://git.vomp.tv/vompclient
authorMarten Richter <marten.richter@freenet.de>
Sat, 9 Nov 2013 08:49:10 +0000 (09:49 +0100)
committerMarten Richter <marten.richter@freenet.de>
Sat, 9 Nov 2013 08:49:10 +0000 (09:49 +0100)
commit1dea83483971d4844322adab652b3f8eddf8ef38
tree104346de1e9c355456a908193464926655589f7c
parent46a5dab5ac45c92862ca75328dd3b53bfb311996
parenta69bb94df7e01f69b312f9aa5a1cd0e698d719ad
Merge branch '0-4-1-dev' of http://git.vomp.tv/vompclient

Conflicts:
boxx.cc
boxx.cc
command.cc