OSDN Git Service

Merge remote-tracking branch 'origin/side-by-side'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 28 Nov 2013 17:26:21 +0000 (19:26 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 28 Nov 2013 17:26:21 +0000 (19:26 +0200)
commit2e07865f16f96bc4706758cc5f2634574d38be37
tree7189c0c90b1ba9b391bcbd5fa1f8ae7304a8ec3f
parent20bcbc195625e75f97a9b01c84e8d4e15af00d4c
parent68726c5bb4b2fed89e9bce9de76e383eccb0a365
Merge remote-tracking branch 'origin/side-by-side'

Conflicts:
CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
CHANGELOG