This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 3b711cb7f4aca5c58e43b643a3ce192a0b8f6e18 (commit)
via a81fcd23f8889f62ec6accbf91cd700b086fd9c8 (commit)
via 963febc877f823a911d53b5c83cfee543c137d59 (commit)
via a5ad0886868a39aa1f0b149e671a716e024ec823 (commit)
via 4024c80ac6514e21dabad14dbc3e47c13b5d6b54 (commit)
via e3446be165dfc778757552639d8a9c23d008d79b (commit)
via 28af7fd46f0fa7446261293f37541cba5f60eebc (commit)
via 2f2067ed2d106628efd7c5ce47399e47239c50af (commit)
via 996676b13aa0c5d0f7ad456737d6ee5b6e444bd6 (commit)
via e21617adba69971d48612f154e59cd2371481559 (commit)
via 5d95bf4fcbb2969642d66ce6829e31b16a7e5ee0 (commit)
from 374c8e6f878acb272c975216f95cdb3d815f8634 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3b711cb7f4aca5c58e43b643a3ce192a0b8f6e18
commit 3b711cb7f4aca5c58e43b643a3ce192a0b8f6e18
Merge: 374c8e6 a81fcd2
Author: Roland Mas <[email protected]>
Date: Wed Jun 24 11:32:38 2015 +0200
Merge branch '6.0'
Conflicts:
src/VERSION
src/debian/changelog
diff --cc src/debian/changelog
index 2289790,78ad73a..25be1c4
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
+fusionforge (6.0.50-0) UNRELEASED; urgency=medium
+
+ * New snapshot from master branch.
+
- -- Roland Mas <[email protected]> Fri, 29 May 2015 17:05:37 +0200
++ -- Roland Mas <[email protected]> Wed, 24 Jun 2015 11:32:26 +0200
++
+ fusionforge (6.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Sylvain Beucler <[email protected]> Tue, 23 Jun 2015 16:16:12 +0200
fusionforge (6.0-1) unstable; urgency=medium
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 6 +
src/common/frs/actions/addrelease.php | 9 -
src/common/frs/views/listpackages.php | 14 +-
src/debian/changelog | 8 +-
src/locale/fusionforge.pot | 435 +++++++++++----------
src/plugins/scmgit/common/GitPlugin.class.php | 147 ++++---
.../etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc | 8 +
.../svnlog.php => scmgit/libexec/gitlog.php} | 19 +-
src/plugins/scmsvn/libexec/svnlog.php | 2 +-
src/rpm/fusionforge.spec.in | 8 +-
src/www/project/admin/tools.php | 2 +-
src/www/projects | 2 +-
src/www/robots.txt | 2 +
13 files changed, 378 insertions(+), 284 deletions(-)
copy src/plugins/{scmsvn/libexec/svnlog.php => scmgit/libexec/gitlog.php} (80%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
