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>
Tibor Simko <tibor.simko@cern.ch> | May 20 2015, 17:09 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
217b57d32d19 | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | May 20 2015 | |||
63bc3a9fa6b0 | Tibor Simko | global: "good luck" to "happy hacking" | May 20 2015 |