discards 7342c77d10810960f49fc5213db4a23dc203fd7a (commit)
discards 9ecdde39b5fb94c4708b530a7c90e82900ff15ed (commit)
discards 69415c934e4b3dc70b22816aa847706336c442f5 (commit)
discards 8b7b83f0a42fc7cce5deaacd1c3a56f76c392175 (commit)
discards 7f89d85adb464f103abda4c3cee75a10f9515921 (commit)
via: 0d3117dc3c66448cd5b7f5219198d57865329619 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (7342c77d10810960f49fc5213db4a23dc203fd7a)
\
N -- N -- N (0d3117dc3c66448cd5b7f5219198d57865329619)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
= COMMIT LOG ===========================================================
========================================================================Summary of changes: mitchcapper/FSClient/Broker.cs | 23 ++- mitchcapper/FSClient/FSClient.csproj | 2 + mitchcapper/FSClient/IContactPlugin.cs | 194 +++++++++++--------- mitchcapper/FSClient/IHeadsetPlugin.cs | 178 ++++++++++--------- mitchcapper/FSClient/IPlugin.cs | 16 ++ mitchcapper/FSClient/PluginManagerBase.cs | 147 +++++++++++++++ .../FSClient/Properties/Settings.Designer.cs | 20 ++ mitchcapper/FSClient/Properties/Settings.settings | 6 + sathieu/cisco-xml/browser/index.php | 23 +-- sathieu/cisco-xml/browser/static/default.css | 49 ----- sathieu/cisco-xml/browser/static/dynamic.js | 4 - sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php | 11 +- sathieu/cisco-xml/lib/MediaBrotha/Backend.php | 89 ++++++---- .../lib/MediaBrotha/Backend/FileSystem.php | 85 +++------ sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php | 98 ---------- sathieu/cisco-xml/lib/MediaBrotha/Backend/Root.php | 33 ++-- sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php | 84 ++++----- sathieu/cisco-xml/lib/MediaBrotha/Core.php | 147 +++++---------- sathieu/cisco-xml/lib/MediaBrotha/Frontend.php | 6 +- .../lib/MediaBrotha/Frontend/CiscoXML.php | 61 +++---- .../cisco-xml/lib/MediaBrotha/Frontend/HTML.php | 127 ------------- .../cisco-xml/lib/MediaBrotha/Frontend/HTTP.php | 33 ---- sathieu/cisco-xml/lib/MediaBrotha/Media.php | 104 ++++------- .../cisco-xml/lib/MediaBrotha/MediaIterator.php | 71 ------- 24 files changed, 656 insertions(+), 955 deletions(-) create mode 100644 mitchcapper/FSClient/IPlugin.cs create mode 100644 mitchcapper/FSClient/PluginManagerBase.cs delete mode 100644 sathieu/cisco-xml/browser/static/default.css delete mode 100644 sathieu/cisco-xml/browser/static/dynamic.js delete mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php delete mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTML.php delete mode 100644 sathieu/cisco-xml/lib/MediaBrotha/Frontend/HTTP.php delete mode 100644 sathieu/cisco-xml/lib/MediaBrotha/MediaIterator.php
this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630
--
FreeSWITCH user-contributed scripts, etc