Branch: refs/heads/master
Commit: 4b866443647ca455d0bf9b65209cecb225f2a056
https://github.com/licq-im/licq/commit/4b866443647ca455d0bf9b65209cecb225f2a056
Author: Anders Olofsson <
fl...@licq.org>
Date: 2014-01-02 (Thu, 02 Jan 2014)
Changed paths:
M licq/src/gpghelper.cpp
M licq/src/sighandler.cpp
Log Message:
-----------
Merge branch '1.8-stable'
Commit: cfc5486e741d656bc03d21e32bd829ba4c525f10
https://github.com/licq-im/licq/commit/cfc5486e741d656bc03d21e32bd829ba4c525f10
Author: Anders Olofsson <
fl...@licq.org>
Date: 2014-01-02 (Thu, 02 Jan 2014)
Changed paths:
M licq/3rdparty/gmock/include/gmock/gmock-actions.h
M licq/3rdparty/gmock/include/gmock/gmock-cardinalities.h
M licq/3rdparty/gmock/include/gmock/gmock-generated-actions.h
M licq/3rdparty/gmock/include/gmock/gmock-generated-actions.h.pump
M licq/3rdparty/gmock/include/gmock/gmock-generated-function-mockers.h
M licq/3rdparty/gmock/include/gmock/gmock-generated-function-mockers.h.pump
M licq/3rdparty/gmock/include/gmock/gmock-generated-matchers.h
M licq/3rdparty/gmock/include/gmock/gmock-generated-matchers.h.pump
M licq/3rdparty/gmock/include/gmock/gmock-generated-nice-strict.h
M licq/3rdparty/gmock/include/gmock/gmock-generated-nice-strict.h.pump
M licq/3rdparty/gmock/include/gmock/gmock-matchers.h
A licq/3rdparty/gmock/include/gmock/gmock-more-matchers.h
M licq/3rdparty/gmock/include/gmock/gmock-spec-builders.h
M licq/3rdparty/gmock/include/gmock/gmock.h
M licq/3rdparty/gmock/include/gmock/internal/gmock-generated-internal-utils.h
M licq/3rdparty/gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump
M licq/3rdparty/gmock/include/gmock/internal/gmock-internal-utils.h
M licq/3rdparty/gmock/include/gmock/internal/gmock-port.h
M licq/3rdparty/gmock/src/gmock-cardinalities.cc
M licq/3rdparty/gmock/src/gmock-internal-utils.cc
M licq/3rdparty/gmock/src/gmock-matchers.cc
M licq/3rdparty/gmock/src/gmock-spec-builders.cc
M licq/3rdparty/gmock/src/gmock.cc
M licq/3rdparty/gmock/src/gmock_main.cc
M licq/3rdparty/gtest/include/gtest/gtest-death-test.h
M licq/3rdparty/gtest/include/gtest/gtest-message.h
M licq/3rdparty/gtest/include/gtest/gtest-param-test.h
M licq/3rdparty/gtest/include/gtest/gtest-param-test.h.pump
M licq/3rdparty/gtest/include/gtest/gtest-printers.h
M licq/3rdparty/gtest/include/gtest/gtest-spi.h
M licq/3rdparty/gtest/include/gtest/gtest-test-part.h
M licq/3rdparty/gtest/include/gtest/gtest.h
M licq/3rdparty/gtest/include/gtest/gtest_pred_impl.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-death-test-internal.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-filepath.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-internal.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-linked_ptr.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-param-util-generated.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
M licq/3rdparty/gtest/include/gtest/internal/gtest-param-util.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-port.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-string.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-tuple.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-tuple.h.pump
M licq/3rdparty/gtest/include/gtest/internal/gtest-type-util.h
M licq/3rdparty/gtest/include/gtest/internal/gtest-type-util.h.pump
M licq/3rdparty/gtest/src/gtest-death-test.cc
M licq/3rdparty/gtest/src/gtest-filepath.cc
M licq/3rdparty/gtest/src/gtest-internal-inl.h
M licq/3rdparty/gtest/src/gtest-port.cc
M licq/3rdparty/gtest/src/gtest-printers.cc
M licq/3rdparty/gtest/src/gtest-test-part.cc
M licq/3rdparty/gtest/src/gtest-typed-test.cc
M licq/3rdparty/gtest/src/gtest.cc
M licq/3rdparty/gtest/src/gtest_main.cc
Log Message:
-----------
Upgrade gmock to version 1.7.0
Compare:
https://github.com/licq-im/licq/compare/6665c875df11...cfc5486e741d