← Back to branch summary

~vikoadi/pantheon-photos/adjustdatetime-context

~vikoadi/pantheon-photos/adjustdatetime-context

Viewing all changes in revision 2525.

Committer: Viko Adi Rahmawan
Date: 2014-07-27 04:42:53 UTC
mfrom: (2522.2.33 pantheon-photos)
Revision ID: vikoadi@gmail.com-20140727044253-i4h6fsdk8yahywr0

resolve conflict

files removed:
icons/five-stars.svg

icons/four-stars.svg

icons/one-star.svg

icons/three-stars.svg

icons/two-stars.svg

ui/search_bar.ui

vapi/gphoto-2.4

vapi/gphoto-2.4/libgphoto2.vapi

vapi/gphoto-2.5

vapi/granite.vapi

vapi/unity.deps

vapi/unity.vapi

files renamed:
src/library/FlaggedBranch.vala => src/library/FlaggedSidebarEntry.vala

src/library/ImportQueueBranch.vala => src/library/ImportQueueSidebarEntry.vala

src/library/LastImportBranch.vala => src/library/LastImportSidebarEntry.vala

src/library/OfflineBranch.vala => src/library/OfflineSidebarEntry.vala

src/library/TrashBranch.vala => src/library/TrashSidebarEntry.vala

vapi/gphoto-2.5/libgphoto2.vapi => vapi/libgphoto2.vapi

files modified:
Makefile

THANKS

configure

po/af.po

po/ar.po

po/as.po

po/ast.po

po/bg.po

po/bn.po

po/bn_IN.po

po/ca.po

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_GB.po

po/eo.po

po/es.po

po/et.po

po/eu.po

po/fi.po

po/fr.po

po/gl.po

po/gu.po

po/he.po

po/hi.po

po/hr.po

po/hu.po

po/ia.po

po/id.po

po/it.po

po/ja.po

po/kk.po

po/km.po

po/kn.po

po/ko.po

po/ky.po

po/lt.po

po/lv.po

po/mk.po

po/ml.po

po/mr.po

po/nb.po

po/nl.po

po/nn.po

po/or.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sk.po

po/sl.po

po/sr.po

po/sv.po

po/ta.po

po/te.po

po/th.po

po/tr.po

po/uk.po

po/vi.po

po/zh_CN.po

po/zh_TW.po

src/AppWindow.vala

src/Application.vala

src/CheckerboardLayout.vala

src/CollectionPage.vala

src/Dialogs.vala

src/MediaDataRepresentation.vala

src/MediaPage.vala

src/Page.vala

src/Photo.vala

src/PhotoPage.vala

src/Resources.vala

src/Screensaver.vala

src/SearchFilter.vala

src/Thumbnail.vala

src/camera/CameraTable.vala

src/camera/GPhoto.vala

src/library/Branch.vala

src/library/LibraryWindow.vala

src/library/mk/library.mk

src/main.vala

src/searches/Branch.vala

src/searches/SavedSearchDialog.vala

src/sidebar/Tree.vala

ui/collection.ui

ui/direct.ui

ui/event.ui

ui/events_directory.ui

ui/import.ui

ui/import_queue.ui

ui/media.ui

ui/offline.ui

ui/photo.ui

ui/photo_context.ui

ui/shotwell.glade

ui/top.ui

ui/trash.ui

Show diffs side-by-side

added added

removed removed

icons/five-stars.svg

icons/four-stars.svg

icons/one-star.svg

icons/three-stars.svg

icons/two-stars.svg

src/AppWindow.vala

src/Application.vala

src/CheckerboardLayout.vala

src/CollectionPage.vala

src/Dialogs.vala

src/MediaDataRepresentation.vala

src/MediaPage.vala

src/PhotoPage.vala

src/Resources.vala

src/Screensaver.vala

src/Thumbnail.vala

src/camera/CameraTable.vala

src/camera/GPhoto.vala

src/library/Branch.vala

src/library/FlaggedSidebarEntry.vala

src/library/ImportQueueSidebarEntry.vala

src/library/LastImportSidebarEntry.vala

src/library/LibraryWindow.vala

src/library/OfflineSidebarEntry.vala

src/library/TrashSidebarEntry.vala

src/library/mk/library.mk

src/searches/Branch.vala

src/searches/SavedSearchDialog.vala

ui/collection.ui

ui/events_directory.ui

ui/import_queue.ui

ui/photo_context.ui

ui/search_bar.ui

ui/shotwell.glade

vapi/gphoto-2.4/

vapi/gphoto-2.4/libgphoto2.vapi

vapi/gphoto-2.5/

vapi/granite.vapi

vapi/unity.deps

vapi/unity.vapi

Older »