Skip to content

Expo 2022#17

Open
cirodevita wants to merge 7 commits intomainfrom
expo-2022
Open

Expo 2022#17
cirodevita wants to merge 7 commits intomainfrom
expo-2022

Conversation

@cirodevita
Copy link
Collaborator

No description provided.

cirodevita added 7 commits February 8, 2022 12:35
# Conflicts:
#	apps/portolano/MainPage.ui
#	apps/portolano/ResultItem.cpp
#	apps/portolano/ResultItem.ui
#	apps/portolano/resources/images/ports/CA/CA_002.jpg
#	apps/portolano/resources/images/ports/CA/CA_003.jpg
#	apps/portolano/resources/images/ports/CA/CA_006.jpg
#	apps/portolano/resources/images/ports/CA/CA_007.jpg
#	apps/portolano/resources/images/ports/CA/CA_008.jpg
#	apps/portolano/resources/images/ports/CA/CA_010.jpg
#	apps/portolano/resources/images/ports/CA/CA_011.jpg
#	apps/portolano/resources/images/ports/CA/CA_012.jpg
#	apps/portolano/resources/images/ports/CA/CA_013.jpg
#	apps/portolano/resources/images/ports/CA/CA_014.jpg
#	apps/portolano/resources/images/ports/CA/CA_015.jpg
#	apps/portolano/resources/images/ports/CA/CA_016.jpg
#	apps/portolano/resources/images/ports/CA/CA_017.jpg
#	apps/portolano/resources/images/ports/CA/CA_018.jpg
#	apps/portolano/resources/images/ports/CA/CA_019.jpg
#	apps/portolano/resources/images/ports/CA/CA_020.jpg
#	apps/portolano/resources/images/ports/CA/CA_021.jpg
#	apps/portolano/resources/images/ports/CA/CA_023.jpg
#	apps/portolano/resources/images/ports/CA/CA_024.jpg
#	apps/portolano/resources/images/ports/CA/CA_025.jpg
#	apps/portolano/resources/images/ports/CA/CA_026.jpg
#	apps/portolano/resources/images/ports/CA/CA_027.jpg
#	apps/portolano/resources/images/ports/CA/CA_030.jpg
#	apps/portolano/resources/images/ports/CA/CA_031.jpg
#	apps/portolano/resources/images/ports/CA/CA_032.jpg
#	apps/portolano/resources/images/ports/CA/CA_033.jpg
#	apps/portolano/resources/images/ports/CA/CA_037.jpg
#	apps/portolano/resources/images/ports/CA/CA_038.jpg
#	apps/portolano/resources/images/ports/CA/CA_039.jpg
#	apps/portolano/resources/images/ports/CA/CA_040.jpg
#	apps/portolano/resources/images/ports/CA/CA_041.jpg
#	apps/portolano/resources/images/ports/CA/CA_042.jpg
#	apps/portolano/resources/images/ports/CA/CA_043.jpg
#	apps/portolano/resources/images/ports/CA/CA_044.jpg
#	apps/portolano/resources/images/ports/CA/CA_045.jpg
#	apps/portolano/resources/images/ports/CA/CA_046.jpg
#	apps/portolano/resources/images/ports/CA/CA_047.jpg
#	apps/portolano/resources/images/ports/CA/CA_048.jpg
#	apps/portolano/resources/images/ports/CA/CA_049.jpg
#	apps/portolano/resources/images/ports/CA/CA_050.jpg
#	apps/portolano/resources/images/ports/CA/CA_056.jpg
#	apps/portolano/resources/images/ports/CA/CA_100.jpg
#	apps/portolano/resources/images/ports/CA/CA_101.jpg
#	apps/portolano/resources/images/ports/CA/CA_102.jpg
#	apps/portolano/resources/images/ports/CA/CA_103.jpg
#	apps/portolano/resources/images/ports/CA/CA_104.jpg
#	apps/portolano/resources/images/ports/CA/CA_105.jpg
#	apps/portolano/resources/images/ports/CA/CA_106.jpg
#	apps/portolano/resources/images/ports/CA/CA_107.jpg
#	apps/portolano/resources/images/ports/CA/CA_108.jpg
#	apps/portolano/resources/images/ports/CA/CA_109.jpg
#	apps/portolano/resources/images/ports/CA/CA_110.jpg
#	apps/portolano/resources/images/ports/CA/CA_111.jpg
#	apps/portolano/resources/images/ports/CA/CA_112.jpg
#	apps/portolano/resources/images/ports/CA/CA_113.jpg
#	apps/portolano/resources/images/ports/CA/CA_990.jpg
#	apps/portolano/resourcesPortolano.qrc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

Comments