Merge branch 'maint-1.0' into maint-1.1
2402e12a01c5
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 24 2014, 12:01.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
Makefile.am

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 24 2014, 12:01

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:2402e12a01c5: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 24 2014, 12:01

	Commit			Author	Details	Committed
	5511a66e5c26			Tibor Simko	installation: location of jquery.treeview	Mar 24 2014

				Path
	M			Makefile.am