# Pastebin I9L2Fy7o swati@swati-HP-Pavilion-15-Notebook-PC:~/digikam-software-compilation$ git pull warning: no common commits remote: Counting objects: 287672, done. remote: Compressing objects: 100% (46069/46069), done. remote: Total 287672 (delta 241157), reused 287162 (delta 240783) Receiving objects: 100% (287672/287672), 205.99 MiB | 1016.00 KiB/s, done. Resolving deltas: 100% (241157/241157), done. From git.kde.org:digikam + 11cb16d...adee0d0 master -> origin/master (forced update) * [new branch] bug309058 -> origin/bug309058 * [new branch] cmake_cleanup -> origin/cmake_cleanup * [new branch] development/0.10 -> origin/development/0.10 * [new branch] development/0.8 -> origin/development/0.8 * [new branch] development/0.8.x -> origin/development/0.8.x * [new branch] development/0.9.x -> origin/development/0.9.x * [new branch] development/1.2 -> origin/development/1.2 * [new branch] development/1.3 -> origin/development/1.3 * [new branch] development/3.0.0 -> origin/development/3.0.0 * [new branch] development/balooport -> origin/development/balooport * [new branch] development/externaltools -> origin/development/externaltools * [new branch] development/gsoc2011-clone -> origin/development/gsoc2011-clone * [new branch] development/gsoc2013-editorcanvas -> origin/development/gsoc2013-editorcanvas * [new branch] development/gsoc2013-imgqsort -> origin/development/gsoc2013-imgqsort * [new branch] development/gsoc2013-localadj -> origin/development/gsoc2013-localadj * [new branch] development/gsoc2013-tagmngr -> origin/development/gsoc2013-tagmngr * [new branch] development/gsoc2013-tagmnr -> origin/development/gsoc2013-tagmnr * [new branch] development/gsoc2013-thumbbar-mv -> origin/development/gsoc2013-thumbbar-mv * [new branch] development/gsoc2013-videow -> origin/development/gsoc2013-videow * [new branch] development/gsoc2014-greyc -> origin/development/gsoc2014-greyc * [new branch] development/gsoc2014-kipibqm -> origin/development/gsoc2014-kipibqm * [new branch] development/gsoc2014-qaccess -> origin/development/gsoc2014-qaccess * [new branch] development/imagemetadatacache -> origin/development/imagemetadatacache * [new branch] development/sok2011-presentation -> origin/development/sok2011-presentation * [new branch] development/usbimport -> origin/development/usbimport * [new branch] developmet/gsoc2013-tagmngr -> origin/developmet/gsoc2013-tagmngr + 6b49407...7a32ab2 frameworks -> origin/frameworks (forced update) * [new branch] gsco2015-advmetadata -> origin/gsco2015-advmetadata * [new branch] gsoc/clone -> origin/gsoc/clone * [new branch] gsoc15-kio-drop -> origin/gsoc15-kio-drop * [new branch] gsoc16-mysql -> origin/gsoc16-mysql * [new branch] gsoc16-red-eye -> origin/gsoc16-red-eye * [new branch] gsoc2013-editorcanvas -> origin/gsoc2013-editorcanvas * [new branch] gsoc2013-tagmngr -> origin/gsoc2013-tagmngr * [new branch] gsoc2014-qaccess -> origin/gsoc2014-qaccess * [new branch] gsoc2015-advmetadata -> origin/gsoc2015-advmetadata * [new branch] kde3 -> origin/kde3 * [new branch] sql/2.0 -> origin/sql/2.0 * [new tag] v1_9_0 -> v1_9_0 * [new tag] v2.0.0 -> v2.0.0 * [new tag] v2.0.0-beta3 -> v2.0.0-beta3 * [new tag] v2.0.0-beta4 -> v2.0.0-beta4 * [new tag] v2.0.0-beta5 -> v2.0.0-beta5 * [new tag] v2.0.0-beta5.1 -> v2.0.0-beta5.1 * [new tag] v2.0.0-beta6 -> v2.0.0-beta6 * [new tag] v2.1.0 -> v2.1.0 * [new tag] v2.2.0 -> v2.2.0 * [new tag] v2.3.0 -> v2.3.0 * [new tag] v2.5.0 -> v2.5.0 * [new tag] v2.6.0 -> v2.6.0 * [new tag] v2.6.0-beta1 -> v2.6.0-beta1 * [new tag] v2.6.0-beta2 -> v2.6.0-beta2 * [new tag] v2.6.0-beta3 -> v2.6.0-beta3 * [new tag] v2.6.0-rc -> v2.6.0-rc * [new tag] v2.7.0 -> v2.7.0 * [new tag] v2.8.0 -> v2.8.0 * [new tag] v2.9.0 -> v2.9.0 * [new tag] v3.0.0 -> v3.0.0 * [new tag] v3.0.0-beta1 -> v3.0.0-beta1 * [new tag] v3.0.0-beta2 -> v3.0.0-beta2 * [new tag] v3.0.0-beta3 -> v3.0.0-beta3 * [new tag] v3.2.0 -> v3.2.0 * [new tag] v3.2.0-beta2 -> v3.2.0-beta2 * [new tag] v3.3.0 -> v3.3.0 * [new tag] v3.3.0-beta1 -> v3.3.0-beta1 * [new tag] v3.3.0-beta2 -> v3.3.0-beta2 * [new tag] v3.3.0-beta3 -> v3.3.0-beta3 * [new tag] v3.4.0 -> v3.4.0 * [new tag] v3.5.0 -> v3.5.0 * [new tag] v4.0.0 -> v4.0.0 * [new tag] v4.0.0-beta1 -> v4.0.0-beta1 * [new tag] v4.0.0-beta1.1 -> v4.0.0-beta1.1 * [new tag] v4.0.0-beta2 -> v4.0.0-beta2 * [new tag] v4.0.0-beta3 -> v4.0.0-beta3 * [new tag] v4.0.0-beta4 -> v4.0.0-beta4 * [new tag] v4.0.0-rc -> v4.0.0-rc * [new tag] v4.1.0 -> v4.1.0 * [new tag] v4.10.0 -> v4.10.0 * [new tag] v4.11.0 -> v4.11.0 * [new tag] v4.12.0 -> v4.12.0 * [new tag] v4.13.0 -> v4.13.0 * [new tag] v4.14.0 -> v4.14.0 * [new tag] v4.2.0 -> v4.2.0 * [new tag] v4.4.0 -> v4.4.0 * [new tag] v4.6.0 -> v4.6.0 * [new tag] v4.7.0 -> v4.7.0 * [new tag] v4.8.0 -> v4.8.0 * [new tag] v4.9.0 -> v4.9.0 * [new tag] v5.0.0-beta1 -> v5.0.0-beta1 * [new tag] v5.0.0-beta2 -> v5.0.0-beta2 * [new tag] v5.0.0-beta3 -> v5.0.0-beta3 * [new tag] v5.0.0-beta4 -> v5.0.0-beta4 * [new tag] v5.0.0-beta5 -> v5.0.0-beta5 * [new tag] v5.0.0beta1 -> v5.0.0beta1 Auto-merging README CONFLICT (add/add): Merge conflict in README Auto-merging NEWS CONFLICT (add/add): Merge conflict in NEWS Auto-merging CMakeLists.txt CONFLICT (add/add): Merge conflict in CMakeLists.txt Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Automatic merge failed; fix conflicts and then commit the result.