Merge branch 'maint-1.1'
db167ac34062
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 3 2015, 21:25.

Description

Merge branch 'maint-1.1'

NOTE During merge, amended AUTHORS and THANKS file as per the new format, listing code contributions in the first and translation contributions in the second.

Conflicts:
AUTHORS

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 3 2015, 21:33

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:db167ac34062: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 3 2015, 21:33

	Commit			Author	Details	Committed
	83182926ce25			Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Mar 3 2015
	2e4ee8078ba0			Tibor Simko	docs: more complete list of past authors	Mar 3 2015

				Path
	M			AUTHORS
	M			THANKS