<h1>Project "FreeSWITCH user-contributed scripts, etc" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
discards d55d498c5d54b30055551e683d5e28b6bf2253f8 (commit)
discards 44e02296787e6776b62d528872eed216c8835fc6 (commit)
discards 577fc9ba2ce176c24897eac5382d4c8239f204f0 (commit)
discards d2a9bb867d3c01d38ea12fa655b65ad68c0b24e0 (commit)
discards faf08b1841ee3f0807afd3d886066aeb3776f739 (commit)
via: 729cc6d3ea25ff83efa9f1cb344cf066eee69efe (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 (d55d498c5d54b30055551e683d5e28b6bf2253f8)
\
N -- N -- N (729cc6d3ea25ff83efa9f1cb344cf066eee69efe)
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.
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Raymond Chandler
comments:
FS-3025
<span style="color: #000080; font-weight: bold">diff --git a/file.txt b/file.txt</span>
<span style="color: #000080; font-weight: bold">index 3fdc27e..201120d 100644</span>
<span style="color: #A00000">--- a/file.txt</span>
<span style="color: #00A000">+++ b/file.txt</span>
<span style="color: #800080; font-weight: bold">@@ -3,3 +3,4 @@ blaaaaaah</span>
blaaaaaah
blaaaaaah
blaaaaaah
<span style="color: #00A000">+testing</span>
</pre></div>
========================================================================<pre>
Summary of changes:
file.txt | 1 +
mitchcapper/FSClient/Broker.cs | 23 +----
mitchcapper/FSClient/External Items/link.pl | 102 ++++++++++----------
mitchcapper/FSClient/FSClient.sln | 4 +-
mitchcapper/FSClient/Properties/AssemblyInfo.cs | 6 +-
.../FSClient/Properties/Settings.Designer.cs | 12 ---
mitchcapper/FSClient/Properties/Settings.settings | 3 -
mitchcapper/FSClient/Setup/Banner.bmp | Bin 2380 -> 0 bytes
mitchcapper/FSClient/Setup/Dialog.bmp | Bin 8896 -> 0 bytes
mitchcapper/FSClient/Setup/FSClient.wxs | 4 +
mitchcapper/FSClient/Setup/Product.wxs | 24 +-----
mitchcapper/FSClient/Setup/Setup.wixproj | 8 --
mitchcapper/FSClient/app.config | 3 -
13 files changed, 65 insertions(+), 125 deletions(-)
delete mode 100644 mitchcapper/FSClient/Setup/Banner.bmp
delete mode 100644 mitchcapper/FSClient/Setup/Dialog.bmp
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH user-contributed scripts, etc</p>