]> cloud.milkyroute.net Git - dolphin.git/commit
Merge branch 'master' into frameworks
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 10 Jul 2014 20:49:05 +0000 (22:49 +0200)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 10 Jul 2014 20:49:05 +0000 (22:49 +0200)
commitfc4315d57e8fe64d05aad2a1c24800f0149b21da
tree5661a5601ecb7a80a74996847b0119206530239d
parentc640dec3f621af25ecf0424bf3197dd439077438
parent1dfafcb176797e5075d0043e70ad07bde8bcc372
Merge branch 'master' into frameworks

Conflicts:
dolphin/src/dolphinmainwindow.cpp
dolphin/src/dolphinviewcontainer.cpp
src/CMakeLists.txt
src/dolphinapplication.cpp
src/dolphinmainwindow.cpp
src/dolphinmainwindow.h
src/dolphinviewcontainer.cpp