-
Committer:
Alberto Mardegan
-
Date:
2015-10-29 15:45:25 UTC
-
mfrom:
(295.1.6 trunk)
-
Revision ID:
alberto.mardegan@canonical.com-20151029154525-f6obiia8r9zg79nl
Merge trunk
[ Alberto Mardegan ]
* Regenerate hooks whenever file time changes (LP: #1510640)
[ CI Train Bot ]
* Resync trunk. added: po/hi.po
[ Alberto Mardegan ]
* Simplify hooks, load v2api library added: click-hooks/accounts.cpp
click-hooks/accounts.hook.in click-hooks/acl-updater.cpp click-
hooks/acl-updater.h click-hooks/click-hooks.pro click-hooks/online-
accounts-hooks2.pro online-accounts-
service/com.ubuntu.OnlineAccounts.Manager.service.in tests/click-
hooks/click-hooks.pro tests/click-hooks/fake_signond.h tests/click-
hooks/signond.py tests/click-hooks/tst_online_accounts_hooks2.cpp
tests/click-hooks/tst_online_accounts_hooks2.pro renamed: click-
hooks/click-hooks.pro => click-hooks/online-accounts-hooks.pro
tests/click-hooks/click-hooks.pro => tests/click-
hooks/tst_online_accounts_hooks.pro
[ CI Train Bot ]
* Resync trunk. added: po/mr.po po/th.po