[vdr-plugin-vdrmanager] 04/06: Merge tag 'upstream/0.12+git20150213'

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-vdrmanager.

commit acdd95a97ebb92ca9ff0deb9e6d8c21981275cd5
Merge: 5ae2d2d 56038e6
Author: etobi <git at e-tobi.net>
Date:   Sat Feb 14 00:28:58 2015 +0100

    Merge tag 'upstream/0.12+git20150213'
    
    Upstream version 0.12+git20150213

 .gitignore                                       | 10 ----------
 .settings/de.loskutov.anyedit.AnyEditTools.prefs | 16 ----------------
 .settings/language.settings.xml                  | 11 -----------
 .settings/org.eclipse.ltk.core.refactoring.prefs |  2 --
 helpers.cpp                                      |  2 +-
 serversock.cpp                                   |  3 ++-
 vdrmanager.cpp                                   |  4 ++--
 7 files changed, 5 insertions(+), 43 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-vdrmanager.git