Homec4science

Merge branch 'maint-1.1' into maint-1.2

Authored by Tibor Simko <tibor.simko@cern.ch> on May 20 2015, 17:09.

Description

Merge branch 'maint-1.1' into maint-1.2

  • maint-1.1: global: "good luck" to "happy hacking"

Conflicts:
configure.ac

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

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:3c20ccd73a53: Merge branch 'maint-1.1' into maint-1.2 (authored by Tibor Simko <tibor.simko@cern.ch>).May 20 2015, 17:09

Merged Changes

CommitAuthorDetailsCommitted
217b57d32d19Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
May 20 2015
63bc3a9fa6b0Tibor Simko
global: "good luck" to "happy hacking" 
May 20 2015