[Pkg-cli-apps-commits] [sparkleshare] 03/08: Merge tag 'upstream/1.5.0'
Andrew Shadura
bugzilla at tut.by
Fri Dec 25 18:44:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
andrewsh pushed a commit to branch master
in repository sparkleshare.
commit 77ca08e77d5f28e0235b222418d3a61cc9ed50ca
Merge: 5a3c43c 2986c09
Author: Andrew Shadura <andrew.shadura at collabora.co.uk>
Date: Fri Dec 25 18:04:17 2015 +0100
Merge tag 'upstream/1.5.0'
Upstream version 1.5.0
.gitignore | 48 +
Makefile.am | 7 +-
Makefile.in | 795 --
News.txt | 54 +
README.md | 34 +-
SparkleLib/Defines.cs | 10 +-
SparkleLib/Defines.cs.in | 8 +-
SparkleLib/Git/Makefile.am | 2 -
SparkleLib/Git/Makefile.in | 685 --
SparkleLib/Git/SparkleFetcherGit.cs | 120 +-
SparkleLib/Git/SparkleGit.cs | 16 +-
SparkleLib/Git/SparkleLib.Git.csproj | 59 +
SparkleLib/Git/SparkleRepoGit.cs | 276 +-
SparkleLib/Makefile.am | 1 -
SparkleLib/Makefile.in | 697 --
SparkleLib/SparkleBackend.cs | 8 +-
SparkleLib/SparkleConfig.cs | 8 +-
SparkleLib/SparkleExtensions.cs | 76 +-
SparkleLib/SparkleFetcherBase.cs | 21 +-
SparkleLib/SparkleFetcherSSH.cs | 17 +
SparkleLib/SparkleLib.csproj | 51 +
SparkleLib/SparkleLib.sln | 20 +
SparkleLib/SparkleListenerBase.cs | 41 +-
SparkleLib/SparkleListenerFactory.cs | 6 +-
SparkleLib/SparkleListenerTcp.cs | 86 +-
SparkleLib/SparkleLogger.cs | 10 +-
SparkleLib/SparkleRepoBase.cs | 197 +-
SparkleLib/SparkleUser.cs | 6 +-
SparkleLib/SparkleWatcher.cs | 6 +-
SparkleLib/SparkleWrappers.cs | 6 +-
SparkleShare/Common/HTML/Makefile.in | 489 -
SparkleShare/Common/HTML/event-log.html | 8 +-
.../add-to-sparkleshare-button.png | Bin 0 -> 4339 bytes
.../Common/HTML/protocol-handler-test/invite.xml | 9 +
.../protocol-handler-test.htm | 38 +
SparkleShare/Common/Makefile.in | 607 --
SparkleShare/Common/Pixmaps/Makefile.am | 1 +
SparkleShare/Common/Pixmaps/Makefile.in | 491 -
.../Common/Pixmaps/Sources/about-dialog.svg | 3494 +++++++
SparkleShare/Common/Pixmaps/Sources/actions.svg | 220 +
SparkleShare/Common/Pixmaps/Sources/app-icons.svg | 2009 ++++
SparkleShare/Common/Pixmaps/Sources/bitbucket.svg | 48 +
.../Pixmaps/Sources/folder-icons-mac-yosemite.svg | 1500 +++
.../Common/Pixmaps/Sources/folder-icons-mac.svg | 144 +
.../Pixmaps/Sources/folder-icons-windows.svg | 1160 +++
SparkleShare/Common/Pixmaps/Sources/github.svg | 82 +
SparkleShare/Common/Pixmaps/Sources/gitorious.svg | 63 +
.../Common/Pixmaps/Sources/side-splash.svg | 3752 ++++++++
SparkleShare/Common/Pixmaps/Sources/ssnet.svg | 105 +
.../Common/Pixmaps/Sources/status-icons.svg | 3057 +++++++
.../Common/Pixmaps/Sources/tutorial-slides.svg | 5904 ++++++++++++
.../Common/Pixmaps/Sources/user-icon-default.svg | 35 +
SparkleShare/Common/Pixmaps/about.png | Bin 51159 -> 66572 bytes
SparkleShare/Common/Pixmaps/about at 2x.png | Bin 0 -> 197165 bytes
SparkleShare/Common/Pixmaps/side-splash.png | Bin 65262 -> 64937 bytes
SparkleShare/Common/Pixmaps/side-splash at 2x.png | Bin 0 -> 189579 bytes
SparkleShare/Common/Pixmaps/text-balloon.png | Bin 0 -> 1118 bytes
SparkleShare/Common/Pixmaps/text-balloon at 2x.png | Bin 0 -> 2632 bytes
SparkleShare/Common/Pixmaps/tutorial-slide-1.png | Bin 28133 -> 27962 bytes
.../Common/Pixmaps/tutorial-slide-1 at 2x.png | Bin 0 -> 71140 bytes
SparkleShare/Common/Pixmaps/tutorial-slide-2.png | Bin 24161 -> 23261 bytes
.../Common/Pixmaps/tutorial-slide-2 at 2x.png | Bin 0 -> 63666 bytes
SparkleShare/Common/Pixmaps/user-icon-default.png | Bin 594 -> 558 bytes
SparkleShare/Common/Plugins/._planio.png | Bin 181 -> 0 bytes
SparkleShare/Common/Plugins/Makefile.in | 498 -
SparkleShare/Common/Plugins/bitbucket at 2x.png | Bin 0 -> 2599 bytes
SparkleShare/Common/Plugins/github.xml | 4 +-
SparkleShare/Common/Plugins/github at 2x.png | Bin 0 -> 3633 bytes
SparkleShare/Common/Plugins/gitorious at 2x.png | Bin 0 -> 2751 bytes
SparkleShare/Common/Plugins/own-server at 2x.png | Bin 0 -> 2409 bytes
SparkleShare/Common/Plugins/parse_plugins.xsl | 33 +
SparkleShare/Common/Plugins/planio.xml | 1 +
SparkleShare/Common/Plugins/planio at 2x.png | Bin 0 -> 4609 bytes
SparkleShare/Common/Plugins/ssnet at 2x.png | Bin 0 -> 3701 bytes
SparkleShare/Common/Translations/LINGUAS | 29 +
SparkleShare/Common/Translations/Makefile.in.in | 222 +
SparkleShare/Common/Translations/POTFILES.in | 24 +
SparkleShare/Common/Translations/POTFILES.skip | 3 +
SparkleShare/Common/Translations/README.transifex | 11 +
SparkleShare/Common/Translations/ar.po | 414 +
SparkleShare/Common/Translations/bg.po | 411 +
SparkleShare/Common/Translations/ca.po | 413 +
SparkleShare/Common/Translations/cs_CZ.po | 413 +
SparkleShare/Common/Translations/da.po | 408 +
SparkleShare/Common/Translations/de.po | 436 +
SparkleShare/Common/Translations/el.po | 389 +
SparkleShare/Common/Translations/eo.po | 407 +
SparkleShare/Common/Translations/es.po | 394 +
SparkleShare/Common/Translations/fi.po | 410 +
SparkleShare/Common/Translations/fr.po | 421 +
SparkleShare/Common/Translations/he.po | 407 +
SparkleShare/Common/Translations/hu.po | 409 +
SparkleShare/Common/Translations/it.po | 391 +
SparkleShare/Common/Translations/ja.po | 407 +
SparkleShare/Common/Translations/nl.po | 427 +
SparkleShare/Common/Translations/nn_NO.po | 408 +
SparkleShare/Common/Translations/no_NO.po | 418 +
SparkleShare/Common/Translations/pl.po | 430 +
SparkleShare/Common/Translations/pt_BR.po | 393 +
SparkleShare/Common/Translations/ru.po | 425 +
SparkleShare/Common/Translations/sk.po | 407 +
SparkleShare/Common/Translations/sl.po | 411 +
SparkleShare/Common/Translations/sort-potfiles | 6 +
SparkleShare/Common/Translations/sr_RS.po | 379 +
SparkleShare/Common/Translations/stamp-it | 0
SparkleShare/Common/Translations/sv.po | 424 +
SparkleShare/Common/Translations/te.po | 405 +
SparkleShare/Common/Translations/uk.po | 409 +
SparkleShare/Common/Translations/zh_CN.po | 378 +
SparkleShare/Common/Translations/zh_TW.po | 404 +
SparkleShare/Linux/Makefile.am | 7 +-
SparkleShare/Linux/Makefile.in | 885 --
SparkleShare/Linux/Pixmaps/Makefile.in | 668 --
SparkleShare/Linux/Pixmaps/icons/Makefile.am | 17 +-
SparkleShare/Linux/Pixmaps/icons/Makefile.in | 654 --
SparkleShare/Linux/Pixmaps/icons/gnome/Makefile.in | 444 -
.../Linux/Pixmaps/icons/process-working-22.png | Bin
.../Linux/Pixmaps/icons/sparkleshare-24.png | Bin 926 -> 1196 bytes
.../Pixmaps/icons/ubuntu-mono-dark/Makefile.in | 450 -
.../Pixmaps/icons/ubuntu-mono-light/Makefile.in | 450 -
SparkleShare/Linux/README.md | 93 +
SparkleShare/Linux/SparkleAbout.cs | 200 +-
SparkleShare/Linux/SparkleBubbles.cs | 58 +-
SparkleShare/Linux/SparkleController.cs | 6 -
SparkleShare/Linux/SparkleEventLog.cs | 210 +-
SparkleShare/Linux/SparkleNote.cs | 141 +
SparkleShare/Linux/SparkleSetup.cs | 230 +-
SparkleShare/Linux/SparkleSetupWindow.cs | 121 +-
SparkleShare/Linux/SparkleSpinner.cs | 76 -
SparkleShare/Linux/SparkleStatusIcon.cs | 163 +-
SparkleShare/Linux/SparkleUI.cs | 67 +-
SparkleShare/Linux/SparkleUIHelpers.cs | 48 +-
SparkleShare/Linux/sparkleshare.appdata.xml | 26 +
SparkleShare/Linux/sparkleshare.in | 44 -
.../Mac/AppDelegate.cs | 29 +-
SparkleShare/Mac/Info.plist | 26 +
SparkleShare/Mac/MainMenu.xib | 2195 +++++
SparkleShare/Mac/MainMenu.xib.designer.cs | 18 +
SparkleShare/Mac/README.md | 57 +
.../Mac/Resources/process-syncing-down.png | Bin 0 -> 270 bytes
.../Mac/Resources/process-syncing-down at 2x.png | Bin 0 -> 396 bytes
.../Mac/Resources/process-syncing-error.png | Bin 0 -> 267 bytes
.../Mac/Resources/process-syncing-error at 2x.png | Bin 0 -> 388 bytes
.../Mac/Resources/process-syncing-idle.png | Bin 0 -> 271 bytes
.../Mac/Resources/process-syncing-idle at 2x.png | Bin 0 -> 726 bytes
SparkleShare/Mac/Resources/process-syncing-up.png | Bin 0 -> 273 bytes
.../Mac/Resources/process-syncing-up at 2x.png | Bin 0 -> 415 bytes
SparkleShare/Mac/Resources/process-syncing.png | Bin 0 -> 271 bytes
SparkleShare/Mac/Resources/process-syncing at 2x.png | Bin 0 -> 329 bytes
SparkleShare/Mac/Resources/sparkleshare-app.icns | Bin 0 -> 143098 bytes
.../Resources/sparkleshare-folder-yosemite.icns | Bin 0 -> 58104 bytes
.../Mac/Resources/sparkleshare-folder.icns | Bin 0 -> 100868 bytes
SparkleShare/Mac/Resources/tutorial-slide-3.png | Bin 0 -> 91923 bytes
SparkleShare/Mac/Resources/tutorial-slide-3 at 2x.png | Bin 0 -> 259208 bytes
SparkleShare/Mac/SparkleAbout.cs | 219 +
SparkleShare/Mac/SparkleBubbles.cs | 54 +
SparkleShare/Mac/SparkleController.cs | 241 +
SparkleShare/Mac/SparkleEventLog.cs | 419 +
SparkleShare/Mac/SparkleMacWatcher.cs | 196 +
SparkleShare/Mac/SparkleNote.cs | 233 +
SparkleShare/Mac/SparkleSetup.cs | 878 ++
SparkleShare/Mac/SparkleSetupWindow.cs | 156 +
SparkleShare/Mac/SparkleShare.csproj | 296 +
SparkleShare/Mac/SparkleShare.sln | 56 +
.../Contents/Info.plist | 57 +
.../Contents/MacOS/applet | Bin 0 -> 34480 bytes
.../SparkleShareInviteOpener.app/Contents/PkgInfo | 1 +
.../Contents/Resources/Scripts/main.scpt | Bin 0 -> 3688 bytes
.../Contents/Resources/applet.icns | Bin 0 -> 40291 bytes
.../Contents/Resources/applet.rsrc | Bin 0 -> 362 bytes
.../Contents/Resources/description.rtfd/TXT.rtf | 4 +
SparkleShare/Mac/SparkleStatusIcon.cs | 288 +
SparkleShare/Mac/SparkleUI.cs | 97 +
SparkleShare/Mac/checkGit.sh | 37 +
SparkleShare/Mac/config | 30 +
SparkleShare/Mac/git.version | 1 +
SparkleShare/Mac/packReleaseDist.sh | 24 +
SparkleShare/Mac/postBuild.sh | 15 +
SparkleShare/Makefile.in | 606 --
SparkleShare/Program.cs | 38 +-
SparkleShare/SparkleAboutController.cs | 2 +-
SparkleShare/SparkleAvatars.cs | 48 +-
SparkleShare/SparkleControllerBase.cs | 420 +-
SparkleShare/SparkleEventLogController.cs | 6 +-
SparkleShare/SparkleInvite.cs | 6 +-
SparkleShare/SparkleKeys.cs | 3 +-
SparkleShare/SparkleNoteController.cs | 67 +
SparkleShare/SparkleSetupController.cs | 14 +-
SparkleShare/SparkleStatusIconController.cs | 252 +-
SparkleShare/Windows/LICENSE.rtf | 115 +
SparkleShare/Windows/Pixmaps/folder.png | Bin 0 -> 639 bytes
.../Windows/Pixmaps/process-syncing-down.png | Bin 0 -> 352 bytes
.../Windows/Pixmaps/process-syncing-error.png | Bin 0 -> 300 bytes
.../Windows/Pixmaps/process-syncing-idle.png | Bin 0 -> 433 bytes
.../Windows/Pixmaps/process-syncing-up.png | Bin 0 -> 357 bytes
SparkleShare/Windows/Pixmaps/process-syncing.png | Bin 0 -> 288 bytes
SparkleShare/Windows/Pixmaps/sparkleshare-app.ico | Bin 0 -> 68092 bytes
.../Windows/Pixmaps/sparkleshare-folder.ico | Bin 0 -> 38403 bytes
.../Windows/Pixmaps/sparkleshare-folder.png | Bin 0 -> 633 bytes
SparkleShare/Windows/Pixmaps/tutorial-slide-3.png | Bin 0 -> 24292 bytes
SparkleShare/Windows/README.md | 43 +
SparkleShare/Windows/Settings.StyleCop | 379 +
SparkleShare/Windows/SparkleAbout.cs | 186 +
.../Windows/SparkleBubbles.cs | 27 +-
SparkleShare/Windows/SparkleController.cs | 270 +
SparkleShare/Windows/SparkleEventLog.cs | 372 +
SparkleShare/Windows/SparkleEventLogWindow.xaml | 38 +
SparkleShare/Windows/SparkleEventLogWindow.xaml.cs | 262 +
.../Windows/SparkleLib/Git/SparkleLib.Git.csproj | 71 +
SparkleShare/Windows/SparkleLib/SparkleLib.csproj | 97 +
SparkleShare/Windows/SparkleNote.xaml | 37 +
SparkleShare/Windows/SparkleNote.xaml.cs | 123 +
SparkleShare/Windows/SparkleNotifyIcon.cs | 188 +
SparkleShare/Windows/SparkleSetup.cs | 985 ++
SparkleShare/Windows/SparkleSetupWindow.cs | 193 +
SparkleShare/Windows/SparkleShare.csproj | 294 +
SparkleShare/Windows/SparkleShare.sln | 49 +
SparkleShare/Windows/SparkleShare.sln.DotSettings | 18 +
SparkleShare/Windows/SparkleShare.vssettings | 97 +
SparkleShare/Windows/SparkleShare.wxs | 82 +
.../Properties/AssemblyInfo.cs | 36 +
.../SparkleShareInviteOpener/Settings.StyleCop | 1 +
.../SparkleShareInviteOpener.csproj | 50 +
.../Windows/SparkleShareInviteOpener/app.config | 3 +
.../sparkleshare-invite-opener.cs | 69 +
SparkleShare/Windows/SparkleShortcut.cs | 196 +
SparkleShare/Windows/SparkleSpinner.cs | 91 +
SparkleShare/Windows/SparkleStatusIcon.cs | 339 +
SparkleShare/Windows/SparkleUI.cs | 73 +
SparkleShare/Windows/SparkleUIHelpers.cs | 79 +
SparkleShare/Windows/build.cmd | 28 +
aclocal.m4 | 999 --
autogen.sh | 85 +
build/Makefile.in | 609 --
build/build.environment.mk | 9 +-
build/build.rules.mk | 4 -
build/bump-version.sh | 16 +
build/m4/Makefile.in | 430 -
build/m4/shamrock/mono.m4 | 34 +-
build/m4/sparkleshare/gtk-sharp.m4 | 15 +-
build/m4/sparkleshare/notify-sharp.m4 | 12 -
config.guess | 1544 ----
config.sub | 1788 ----
configure | 5310 -----------
configure.ac | 47 +-
install-sh | 527 --
legal/Authors.txt | 22 +-
legal/License_for_SparkleLib.txt | 166 +
.../{License.txt => License_for_SparkleShare.txt} | 0
ltmain.sh | 9655 --------------------
missing | 215 -
251 files changed, 46850 insertions(+), 30941 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/sparkleshare.git
More information about the Pkg-cli-apps-commits
mailing list