projects / kernel / swap-modules.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad2c8d3 a811939)
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Tue, 20 Nov 2012 09:39:31 +0000 (13:39 +0400)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Tue, 20 Nov 2012 09:39:31 +0000 (13:39 +0400)
Conflicts:
src/daemon/Makefile.am


Trivial merge
Domain: System / System Tools;