Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/fusion-icon

Conflicts: admin cmake
12 years ago · d23c1d255c
parent 9948563630 0305e778e8
commit d23c1d255c
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0
+Subproject commit 4027b878fb556a51ed29affd578e78aa70997480
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280
+Subproject commit ba27b9f2328dabe778a9e129e96b706797da85fe
		`@ -1 +1 @@`
			`Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0`				`Subproject commit 4027b878fb556a51ed29affd578e78aa70997480`
		`@ -1 +1 @@`
			`Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280`				`Subproject commit ba27b9f2328dabe778a9e129e96b706797da85fe`