merged from new-pomodoro branch

eightfiftytwo · Jul 23, 2023 · e504201 · e504201
1 parent 04479de
commit e504201
Show file tree

Hide file tree

Showing 229 changed files with 480 additions and 4,993 deletions.
diff --git a/...er/cache/objects/1a/1a008e7d238dc1e7b07768f0955a97d9f8ad02434ec14c64e8894d0d4788e7.commit b/...er/cache/objects/1a/1a008e7d238dc1e7b07768f0955a97d9f8ad02434ec14c64e8894d0d4788e7.commit
diff --git a/...er/cache/objects/1c/262bf551d8c45daa4fb75b85bcf5a588e0f117606d94b5eddc20e1ec542dc8.commit b/...er/cache/objects/1c/262bf551d8c45daa4fb75b85bcf5a588e0f117606d94b5eddc20e1ec542dc8.commit
diff --git a/...er/cache/objects/20/3c85f7d9a9363fe8555f314c1259bdbf33b05611661269b3762c4aeeb04be8.commit b/...er/cache/objects/20/3c85f7d9a9363fe8555f314c1259bdbf33b05611661269b3762c4aeeb04be8.commit
diff --git a/...er/cache/objects/36/bf64d62d471ded612a3f1151a88888cb8a9ddbdddbc5583224b007a95044d9.commit b/...er/cache/objects/36/bf64d62d471ded612a3f1151a88888cb8a9ddbdddbc5583224b007a95044d9.commit
diff --git a/...er/cache/objects/3b/d88d9d9ae2d5e953d4c09710d57effb121f7a994c61d4b54005125e1c252d4.commit b/...er/cache/objects/3b/d88d9d9ae2d5e953d4c09710d57effb121f7a994c61d4b54005125e1c252d4.commit
diff --git a/...er/cache/objects/3d/33a6130bf4ea9908bacbf9bc57f7544ca4d73df07b8e4b7c900fe0b96ea10c.commit b/...er/cache/objects/3d/33a6130bf4ea9908bacbf9bc57f7544ca4d73df07b8e4b7c900fe0b96ea10c.commit
diff --git a/...er/cache/objects/54/d61da46a7aa5d0704ea897f0b1bdc05340d5911d091b010e0389a9c10cff0d.commit b/...er/cache/objects/54/d61da46a7aa5d0704ea897f0b1bdc05340d5911d091b010e0389a9c10cff0d.commit
diff --git a/...er/cache/objects/59/6c6c146856cd64800b672ee3d02fb81bb73cef9a20ef4c22d4fda9e8122896.commit b/...er/cache/objects/59/6c6c146856cd64800b672ee3d02fb81bb73cef9a20ef4c22d4fda9e8122896.commit
diff --git a/...er/cache/objects/5e/2480cb8a37d87855d2871747954465683ea82785b27244f1cc085ef333eeb6.commit b/...er/cache/objects/5e/2480cb8a37d87855d2871747954465683ea82785b27244f1cc085ef333eeb6.commit
diff --git a/...er/cache/objects/6d/03734299049cfaeb0c593c72c30a8f4fbf38e373d3a82c917e35f619dc2b5f.commit b/...er/cache/objects/6d/03734299049cfaeb0c593c72c30a8f4fbf38e373d3a82c917e35f619dc2b5f.commit
diff --git a/...er/cache/objects/77/f55ae4b806c775be0cebf2f3c55624cbada82dec4215390f4b513870ed829a.commit b/...er/cache/objects/77/f55ae4b806c775be0cebf2f3c55624cbada82dec4215390f4b513870ed829a.commit
diff --git a/...r/cache/objects/78/93c69a777d669446e45259b1d348294b5d2bc848d6fe05db747897532b2982.dirtree b/...r/cache/objects/78/93c69a777d669446e45259b1d348294b5d2bc848d6fe05db747897532b2982.dirtree
diff --git a/...er/cache/objects/85/81c706b9ffcf428e19a379fb5ec5a814001596d260c19de2c442c4da4f868c.commit b/...er/cache/objects/85/81c706b9ffcf428e19a379fb5ec5a814001596d260c19de2c442c4da4f868c.commit
diff --git a/...er/cache/objects/8e/c9c6017a3eb0d5e8c0eb4ab07a73f5736359add2e186a4182ef0851a11aac6.commit b/...er/cache/objects/8e/c9c6017a3eb0d5e8c0eb4ab07a73f5736359add2e186a4182ef0851a11aac6.commit
diff --git a/...er/cache/objects/a4/8f10569d6b8cf42a0b3ce9563f87dbd5c0abd495a9afb3f69a9cb2e55b7e37.commit b/...er/cache/objects/a4/8f10569d6b8cf42a0b3ce9563f87dbd5c0abd495a9afb3f69a9cb2e55b7e37.commit
diff --git a/...r/cache/objects/b0/ba1312b62731cef76e17d7d2f9964fdf64336ef817149e9ba6c9c7f646a78a.dirtree b/...r/cache/objects/b0/ba1312b62731cef76e17d7d2f9964fdf64336ef817149e9ba6c9c7f646a78a.dirtree
diff --git a/...er/cache/objects/b5/058e058534146c3813833fae79ae369d035d72bec09e0fc6e4bc15fbf3b2d0.commit b/...er/cache/objects/b5/058e058534146c3813833fae79ae369d035d72bec09e0fc6e4bc15fbf3b2d0.commit
diff --git a/...er/cache/objects/b8/d514f91e2d846a4910d42b7d85a7f40a56b77a3651c338d0935725fde31a7a.commit b/...er/cache/objects/b8/d514f91e2d846a4910d42b7d85a7f40a56b77a3651c338d0935725fde31a7a.commit
diff --git a/...er/cache/objects/c2/14aeb1fbe1c1dcc163345ee316d1845527e82631fd0fe278ddb01f145403d3.commit b/...er/cache/objects/c2/14aeb1fbe1c1dcc163345ee316d1845527e82631fd0fe278ddb01f145403d3.commit
diff --git a/...er/cache/objects/c3/f0bfd0b87998a5c2b0024a3fa363719951b87c01821a4d20328e04501e009b.commit b/...er/cache/objects/c3/f0bfd0b87998a5c2b0024a3fa363719951b87c01821a4d20328e04501e009b.commit
diff --git a/...er/cache/objects/cf/b11eba3f3d3444d9a3ce54e7434756f289b569bd7d891e4fd88489a10368bf.commit b/...er/cache/objects/cf/b11eba3f3d3444d9a3ce54e7434756f289b569bd7d891e4fd88489a10368bf.commit
diff --git a/...er/cache/objects/e1/f4f6089a775ebb89432031ee3fce7e46e860a18fbf1634d3f961b5e70d946e.commit b/...er/cache/objects/e1/f4f6089a775ebb89432031ee3fce7e46e860a18fbf1634d3f961b5e70d946e.commit
diff --git a/...er/cache/objects/f8/2920f8381b3fed1601014d2f451535e33b40ee2f47398bf75839a4e149e9df.commit b/...er/cache/objects/f8/2920f8381b3fed1601014d2f451535e33b40ee2f47398bf75839a4e149e9df.commit
diff --git a/...er/cache/objects/f9/1c39661f60b32f255a3209645e7dbf5a17cad9c27f18e0c432290b8e6629e7.commit b/...er/cache/objects/f9/1c39661f60b32f255a3209645e7dbf5a17cad9c27f18e0c432290b8e6629e7.commit
diff --git a/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-blueprint b/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-blueprint
@@ -1 +1 @@
-e87e27305ac87b75f6843bb558d2c2673e1c4e36c2bfa633d0624623f3c6b57d
+b5058e058534146c3813833fae79ae369d035d72bec09e0fc6e4bc15fbf3b2d0
diff --git a/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-gsound b/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-gsound
@@ -1,5 +1 @@
-<<<<<<< HEAD
-293afffede885b824178c7f81257e39eacfbb9030a4014fc2bc6dc6a20b1a21b
-=======
-e45c18d345d29ccf740fcde2e689758a1160eff3ad47c1972d935cbf03229275
->>>>>>> new-pomodoro
+b8d514f91e2d846a4910d42b7d85a7f40a56b77a3651c338d0935725fde31a7a
diff --git a/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-intltool b/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-intltool
@@ -1,5 +1 @@
-<<<<<<< HEAD
-8dc2ea87da10be2dd41366d9b6aadfb728d7606e5a70c4b4d7f074a72e3af816
-=======
-aa52b6198e5f93921739e93780c8389dc326554536d65b0275be8c6ff6664e53
->>>>>>> new-pomodoro
+1a1a008e7d238dc1e7b07768f0955a97d9f8ad02434ec14c64e8894d0d4788e7
diff --git a/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-libcanberra b/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-libcanberra
@@ -1,5 +1 @@
-<<<<<<< HEAD
-81022337c414dba4bc79b78783f7177655a60870a08c5ff1721369195e698620
-=======
-90c7e6d465f437764c0a146b44f7e53a4eb9d4e35445d15cdb8d9cafa63b45e5
->>>>>>> new-pomodoro
+a48f10569d6b8cf42a0b3ce9563f87dbd5c0abd495a9afb3f69a9cb2e55b7e37
diff --git a/...r/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-sound-theme-freedesktop b/...r/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/build-sound-theme-freedesktop
@@ -1,5 +1 @@
-<<<<<<< HEAD
-769ca8281dbb9e48b7f15ae3104d7e038fa4fc669ddaa9472a73899848d98e41
-=======
-c72bfc81fba4f645e6d39339a685ff991419c1130f5b52fa2d7930d3d79e848a
->>>>>>> new-pomodoro
+8581c706b9ffcf428e19a379fb5ec5a814001596d260c19de2c442c4da4f868c
diff --git a/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/init b/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.Pomodoro.json/init
@@ -1,5 +1 @@
-<<<<<<< HEAD
-9ddb0aed68aa31e9d26078c5c621c7a58ac73e46d31516f8e362e101983ffffe
-=======
-ce47a8b8df566ef0081f3ab5820de7343f68d35d386e938dfff2a52df12b2cf8
->>>>>>> new-pomodoro
+f82920f8381b3fed1601014d2f451535e33b40ee2f47398bf75839a4e149e9df
diff --git a/...ak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-blueprint b/...ak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-blueprint
@@ -1 +1 @@
-765359d4da48ccf73c19559e42cfa1e50e0458bfd0c02ef07ff855811ffeb7ed
+3bd88d9d9ae2d5e953d4c09710d57effb121f7a994c61d4b54005125e1c252d4
diff --git a/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-gsound b/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-gsound
@@ -1 +1 @@
-f0a7fa4cbe2e1b13ba12785c1f6b980e2bfc35afcccd1b9786dc59232db8f23d
+1c262bf551d8c45daa4fb75b85bcf5a588e0f117606d94b5eddc20e1ec542dc8
diff --git a/...pak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-intltool b/...pak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-intltool
@@ -1 +1 @@
-6110c59899e01c7fad15261591a6b95b8fc01ee0c672ddf71455afcff2a9b35d
+54d61da46a7aa5d0704ea897f0b1bdc05340d5911d091b010e0389a9c10cff0d
diff --git a/...k-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-intltool-2 b/...k-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-intltool-2
diff --git a/...-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-libcanberra b/...-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-libcanberra
@@ -1 +1 @@
-a0b45af78d2bca3a416234aa2e962c284e2b50849c352301cc9c0b16834d9b7c
+5e2480cb8a37d87855d2871747954465683ea82785b27244f1cc085ef333eeb6
diff --git a/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-libgda b/.flatpak-builder/cache/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-libgda
diff --git a/...he/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-sound-theme-freedesktop b/...he/refs/heads/x86_64-io.gitlab.idevecore.PomodoroDevel.json/build-sound-theme-freedesktop
@@ -1 +1 @@
-590fcef45719fda14e5aaab578cd89901890aa44a6e11d5f9fd7ab9ed03a2d9e
+c3f0bfd0b87998a5c2b0024a3fa363719951b87c01821a4d20328e04501e009b
diff --git a/.flatpak-builder/ccache/0/0/stats b/.flatpak-builder/ccache/0/0/stats
@@ -17,23 +17,23 @@
 0
 0
 0
-2
+4
 0
 0
-3
+6
 0
 0
 0
 0
 0
-2
+4
 0
 0
 0
 0
 1
 0
-7
+13
 1
 0
 0
@@ -42,7 +42,7 @@
 0
 0
 1
-4
+7
 0
 0
 0

diff --git a/.flatpak-builder/ccache/0/1/stats b/.flatpak-builder/ccache/0/1/stats
@@ -2,18 +2,9 @@
 0
 0
 0
-<<<<<<< HEAD
-=======
-1
 0
 0
 0
-2
-0
-0
-0
-0
->>>>>>> new-pomodoro
 0
 0
 0
@@ -29,41 +20,20 @@
 0
 0
 0
-<<<<<<< HEAD
-=======
-1
-0
-0
-0
-0
-3
-1
 2
-4
->>>>>>> new-pomodoro
 0
 0
 0
 0
 0
 0
-<<<<<<< HEAD
-0
-0
-0
-=======
-4
-2
->>>>>>> new-pomodoro
-1
-0
-0
 0
 0
 0
 0
 0
 0
+4
 0
 0
 0
@@ -72,6 +42,7 @@
 0
 0
 0
+2
 0
 0
 0
@@ -92,7 +63,6 @@
 0
 0
 0
-<<<<<<< HEAD
 0
 0
 0
@@ -110,5 +80,3 @@
 0
 0
 0
-=======
->>>>>>> new-pomodoro
diff --git a/.flatpak-builder/ccache/0/2/stats b/.flatpak-builder/ccache/0/2/stats
@@ -17,7 +17,7 @@
 0
 0
 0
-2
+4
 0
 0
 1

diff --git a/.flatpak-builder/ccache/0/3/stats b/.flatpak-builder/ccache/0/3/stats
@@ -2,17 +2,6 @@
 0
 0
 0
-<<<<<<< HEAD
-1
-=======
-2
-0
-0
-0
-0
-0
-3
->>>>>>> new-pomodoro
 0
 0
 0
@@ -24,63 +13,40 @@
 0
 0
 0
-<<<<<<< HEAD
-0
-0
-0
 0
 0
 0
 0
 0
 0
 0
+2
 0
 0
 0
 0
 0
 0
 0
-1
-1
 0
-=======
->>>>>>> new-pomodoro
-2
 0
 0
 0
 0
+4
 0
 0
-<<<<<<< HEAD
-2
 0
-1
 0
-=======
 0
 0
 0
 0
 2
-2
-4
-4
-0
-0
 0
 0
 0
 0
-4
-2
-2
-0
->>>>>>> new-pomodoro
-0
-0
 0
 0
 0

diff --git a/.flatpak-builder/ccache/0/4/stats b/.flatpak-builder/ccache/0/4/stats
@@ -6,12 +6,9 @@
 0
 0
 0
-<<<<<<< HEAD
-0
-0
-0
 0
 0
+2
 0
 0
 0
@@ -21,13 +18,9 @@
 0
 0
 0
-1
 0
-=======
-1
 0
-3
->>>>>>> new-pomodoro
+2
 0
 0
 0
@@ -37,45 +30,23 @@
 0
 0
 0
-<<<<<<< HEAD
-1
-1
-2
-2
-=======
 0
 0
-3
-0
 0
+4
 0
 0
->>>>>>> new-pomodoro
 0
 0
 0
 0
 0
 0
 2
-1
-<<<<<<< HEAD
-=======
-7
-3
-0
-0
 0
 0
 0
 0
-3
-4
->>>>>>> new-pomodoro
-1
-0
-0
-0
 0
 0
 0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e87e27305ac87b75f6843bb558d2c2673e1c4e36c2bfa633d0624623f3c6b57d
		b5058e058534146c3813833fae79ae369d035d72bec09e0fc6e4bc15fbf3b2d0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		765359d4da48ccf73c19559e42cfa1e50e0458bfd0c02ef07ff855811ffeb7ed
		3bd88d9d9ae2d5e953d4c09710d57effb121f7a994c61d4b54005125e1c252d4
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f0a7fa4cbe2e1b13ba12785c1f6b980e2bfc35afcccd1b9786dc59232db8f23d
		1c262bf551d8c45daa4fb75b85bcf5a588e0f117606d94b5eddc20e1ec542dc8
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6110c59899e01c7fad15261591a6b95b8fc01ee0c672ddf71455afcff2a9b35d
		54d61da46a7aa5d0704ea897f0b1bdc05340d5911d091b010e0389a9c10cff0d
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		a0b45af78d2bca3a416234aa2e962c284e2b50849c352301cc9c0b16834d9b7c
		5e2480cb8a37d87855d2871747954465683ea82785b27244f1cc085ef333eeb6
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		590fcef45719fda14e5aaab578cd89901890aa44a6e11d5f9fd7ab9ed03a2d9e
		c3f0bfd0b87998a5c2b0024a3fa363719951b87c01821a4d20328e04501e009b
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,23 +17,23 @@
		0
		0
		0
		2
		4
		0
		0
		3
		6
		0
		0
		0
		0
		0
		2
		4
		0
		0
		0
		0
		1
		0
		7
		13
		1
		0
		0
Expand All		@@ -42,7 +42,7 @@
		0
		0
		1
		4
		7
		0
		0
		0
Expand Down