[Pkg-mono-svn-commits] [mono-tools] 01/03: Merge tag 'upstream/3.10'

Jo Shields directhex at moszumanska.debian.org
Wed Oct 8 11:51:54 UTC 2014


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

directhex pushed a commit to annotated tag debian/3.10-1
in repository mono-tools.

commit 2c805672e6dbd25b09b92a845071e4eec2565822
Merge: 3df951d 25b8caf
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Wed Oct 8 12:31:43 2014 +0100

    Merge tag 'upstream/3.10'
    
    Upstream version 3.10
    
    Conflicts:
    	INSTALL
    	Makefile.in
    	Mono.Profiler/Makefile.in
    	Mono.Profiler/Mono.Profiler.Widgets/Makefile.in
    	Mono.Profiler/heap-snapshot-explorer/Makefile.in
    	Mono.Profiler/heap-snapshot-viewer/Makefile.in
    	Mono.Profiler/mprof-gui/Makefile.in
    	Mono.Profiler/profiler-decoder-library/Makefile.in
    	Mono.Profiler/profiler-file-decoder/Makefile.in
    	aclocal.m4
    	asn1view/Makefile.in
    	asn1view/art/Makefile.in
    	asn1view/common/Makefile.in
    	asn1view/gtk/Makefile.in
    	config.guess
    	config.sub
    	configure
    	configure.in
    	create-native-map/Makefile.in
    	create-native-map/bin/Makefile.in
    	create-native-map/lib/Makefile.in
    	create-native-map/lib/create-native-map/Makefile.in
    	create-native-map/lib/pkgconfig/Makefile.in
    	create-native-map/man/Makefile.in
    	create-native-map/src/Makefile.in
    	docbrowser/Makefile.in
    	docbrowser/theme-icons/Makefile.in
    	gendarme/AssemblyInfo.cs
    	gendarme/Makefile.in
    	gendarme/console/Makefile.in
    	gendarme/framework/Makefile.in
    	gendarme/framework/Test/Makefile.in
    	gendarme/man/Makefile.in
    	gendarme/rules/Gendarme.Rules.BadPractice/Makefile.in
    	gendarme/rules/Gendarme.Rules.BadPractice/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Concurrency/Makefile.in
    	gendarme/rules/Gendarme.Rules.Concurrency/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Correctness/Makefile.in
    	gendarme/rules/Gendarme.Rules.Correctness/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Design.Generic/Makefile.in
    	gendarme/rules/Gendarme.Rules.Design.Generic/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Design.Linq/Makefile.in
    	gendarme/rules/Gendarme.Rules.Design.Linq/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Design/Makefile.in
    	gendarme/rules/Gendarme.Rules.Design/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Exceptions/Makefile.in
    	gendarme/rules/Gendarme.Rules.Exceptions/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Gendarme/Makefile.in
    	gendarme/rules/Gendarme.Rules.Gendarme/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Globalization/Makefile.in
    	gendarme/rules/Gendarme.Rules.Globalization/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Interoperability.Com/Makefile.in
    	gendarme/rules/Gendarme.Rules.Interoperability.Com/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Interoperability/Makefile.in
    	gendarme/rules/Gendarme.Rules.Interoperability/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Maintainability/Makefile.in
    	gendarme/rules/Gendarme.Rules.Maintainability/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.NUnit/Makefile.in
    	gendarme/rules/Gendarme.Rules.NUnit/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Naming/Makefile.in
    	gendarme/rules/Gendarme.Rules.Naming/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Performance/Makefile.in
    	gendarme/rules/Gendarme.Rules.Performance/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Portability/Makefile.in
    	gendarme/rules/Gendarme.Rules.Portability/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Security.Cas/Makefile.in
    	gendarme/rules/Gendarme.Rules.Security.Cas/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Security/Makefile.in
    	gendarme/rules/Gendarme.Rules.Security/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Serialization/Makefile.in
    	gendarme/rules/Gendarme.Rules.Serialization/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Smells/Makefile.in
    	gendarme/rules/Gendarme.Rules.Smells/Test/Makefile.in
    	gendarme/rules/Gendarme.Rules.Ui/Makefile.in
    	gendarme/rules/Gendarme.Rules.Ui/Test/Makefile.in
    	gendarme/rules/Makefile.in
    	gendarme/rules/Test.Rules/Makefile.in
    	gendarme/swf-wizard-runner/Makefile.in
    	gendarme/tools/Makefile.in
    	gendarme/tools/supported/Makefile.in
    	gendarme/tools/supported/gd2i/Makefile.in
    	gendarme/tools/supported/templates/Makefile.in
    	gendarme/tools/unsupported/Makefile.in
    	gendarme/tools/unsupported/mapper/Makefile.in
    	gendarme/tools/unsupported/typeref/Makefile.in
    	gendarme/tools/unsupported/xmldoc2wiki/Makefile.in
    	gendarme/wix/Makefile.in
    	gsharp/Makefile.in
    	gui-compare/CompareContext.cs
    	gui-compare/Makefile.in
    	ilcontrast/Makefile.in
    	install-sh
    	minvoke/Makefile.in
    	missing
    	mperfmon/Makefile.in
    	po/mono-tools.pot
    	webdoc/Makefile.in

 INSTALL                                            |  12 +-
 Makefile.in                                        | 314 +++++-----
 Mono.Profiler/Makefile.in                          | 267 ++++----
 Mono.Profiler/Mono.Profiler.Widgets/Makefile.in    | 106 +++-
 Mono.Profiler/heap-snapshot-explorer/Makefile.in   | 106 +++-
 Mono.Profiler/heap-snapshot-viewer/Makefile.in     | 120 ++--
 Mono.Profiler/mprof-gui/Makefile.in                | 110 +++-
 Mono.Profiler/profiler-decoder-library/Makefile.in | 106 +++-
 Mono.Profiler/profiler-file-decoder/Makefile.in    | 120 ++--
 aclocal.m4                                         | 688 +++++++++++++--------
 asn1view/Makefile.in                               | 269 ++++----
 asn1view/art/Makefile.in                           | 106 +++-
 asn1view/common/Makefile.in                        | 106 +++-
 asn1view/gtk/Makefile.in                           | 108 +++-
 compile                                            | 347 +++++++++++
 config.guess                                       | 184 +++---
 config.sub                                         |  97 +--
 configure                                          | 550 +++++++++++-----
 configure.in                                       |   2 +-
 create-native-map/Makefile.in                      | 267 ++++----
 create-native-map/bin/Makefile.in                  | 106 +++-
 create-native-map/lib/Makefile.in                  | 267 ++++----
 .../lib/create-native-map/Makefile.in              | 106 +++-
 create-native-map/lib/pkgconfig/Makefile.in        | 108 +++-
 create-native-map/man/Makefile.in                  | 121 ++--
 create-native-map/src/Makefile.in                  | 106 +++-
 docbrowser/Makefile.in                             | 256 ++++----
 docbrowser/theme-icons/Makefile.in                 | 105 +++-
 gendarme/AssemblyInfo.cs                           |   2 +-
 gendarme/Makefile.in                               | 272 ++++----
 gendarme/console/Makefile.in                       | 111 ++--
 gendarme/framework/Makefile.in                     | 270 ++++----
 gendarme/framework/Test/Makefile.in                | 106 +++-
 gendarme/man/Makefile.in                           | 127 ++--
 .../rules/Gendarme.Rules.BadPractice/Makefile.in   | 265 ++++----
 .../Gendarme.Rules.BadPractice/Test/Makefile.in    | 106 +++-
 .../rules/Gendarme.Rules.Concurrency/Makefile.in   | 265 ++++----
 .../Gendarme.Rules.Concurrency/Test/Makefile.in    | 106 +++-
 .../rules/Gendarme.Rules.Correctness/Makefile.in   | 265 ++++----
 .../Gendarme.Rules.Correctness/Test/Makefile.in    | 106 +++-
 .../Gendarme.Rules.Design.Generic/Makefile.in      | 265 ++++----
 .../Gendarme.Rules.Design.Generic/Test/Makefile.in | 106 +++-
 .../rules/Gendarme.Rules.Design.Linq/Makefile.in   | 265 ++++----
 .../Gendarme.Rules.Design.Linq/Test/Makefile.in    | 106 +++-
 gendarme/rules/Gendarme.Rules.Design/Makefile.in   | 265 ++++----
 .../rules/Gendarme.Rules.Design/Test/Makefile.in   | 106 +++-
 .../rules/Gendarme.Rules.Exceptions/Makefile.in    | 265 ++++----
 .../Gendarme.Rules.Exceptions/Test/Makefile.in     | 106 +++-
 gendarme/rules/Gendarme.Rules.Gendarme/Makefile.in | 265 ++++----
 .../rules/Gendarme.Rules.Gendarme/Test/Makefile.in | 106 +++-
 .../rules/Gendarme.Rules.Globalization/Makefile.in | 265 ++++----
 .../Gendarme.Rules.Globalization/Test/Makefile.in  | 106 +++-
 .../Makefile.in                                    | 265 ++++----
 .../Test/Makefile.in                               | 106 +++-
 .../Gendarme.Rules.Interoperability/Makefile.in    | 265 ++++----
 .../Test/Makefile.in                               | 106 +++-
 .../Gendarme.Rules.Maintainability/Makefile.in     | 265 ++++----
 .../Test/Makefile.in                               | 106 +++-
 gendarme/rules/Gendarme.Rules.NUnit/Makefile.in    | 265 ++++----
 .../rules/Gendarme.Rules.NUnit/Test/Makefile.in    | 106 +++-
 gendarme/rules/Gendarme.Rules.Naming/Makefile.in   | 265 ++++----
 .../rules/Gendarme.Rules.Naming/Test/Makefile.in   | 106 +++-
 .../rules/Gendarme.Rules.Performance/Makefile.in   | 265 ++++----
 .../Gendarme.Rules.Performance/Test/Makefile.in    | 106 +++-
 .../rules/Gendarme.Rules.Portability/Makefile.in   | 265 ++++----
 .../Gendarme.Rules.Portability/Test/Makefile.in    | 106 +++-
 .../rules/Gendarme.Rules.Security.Cas/Makefile.in  | 265 ++++----
 .../Gendarme.Rules.Security.Cas/Test/Makefile.in   | 106 +++-
 gendarme/rules/Gendarme.Rules.Security/Makefile.in | 265 ++++----
 .../rules/Gendarme.Rules.Security/Test/Makefile.in | 106 +++-
 .../rules/Gendarme.Rules.Serialization/Makefile.in | 265 ++++----
 .../Gendarme.Rules.Serialization/Test/Makefile.in  | 106 +++-
 gendarme/rules/Gendarme.Rules.Smells/Makefile.in   | 265 ++++----
 .../rules/Gendarme.Rules.Smells/Test/Makefile.in   | 106 +++-
 gendarme/rules/Gendarme.Rules.Ui/Makefile.in       | 265 ++++----
 gendarme/rules/Gendarme.Rules.Ui/Test/Makefile.in  | 106 +++-
 gendarme/rules/Makefile.in                         | 271 ++++----
 gendarme/rules/Test.Rules/Makefile.in              | 111 ++--
 gendarme/swf-wizard-runner/Makefile.in             | 109 +++-
 gendarme/tools/Makefile.in                         | 267 ++++----
 gendarme/tools/supported/Makefile.in               | 267 ++++----
 gendarme/tools/supported/gd2i/Makefile.in          | 108 +++-
 gendarme/tools/supported/templates/Makefile.in     | 106 +++-
 gendarme/tools/unsupported/Makefile.in             | 267 ++++----
 gendarme/tools/unsupported/mapper/Makefile.in      | 106 +++-
 gendarme/tools/unsupported/typeref/Makefile.in     | 106 +++-
 gendarme/tools/unsupported/xmldoc2wiki/Makefile.in | 108 +++-
 gendarme/wix/Makefile.in                           | 106 +++-
 gsharp/Makefile.in                                 | 113 ++--
 gui-compare/CompareContext.cs                      |  10 +-
 gui-compare/Makefile.in                            | 110 +++-
 ilcontrast/Makefile.in                             | 110 +++-
 install-sh                                         |  14 +-
 minvoke/Makefile.in                                | 109 +++-
 missing                                            | 414 +++++--------
 mperfmon/Makefile.in                               | 124 ++--
 po/mono-tools.pot                                  |   2 +-
 webdoc/Makefile.in                                 | 108 +++-
 98 files changed, 10223 insertions(+), 6662 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/mono-tools.git



More information about the Pkg-mono-svn-commits mailing list