Merge branch 'osx' of https://github.com/deejay1/SparkleShare
Conflicts: po/POTFILES.in
This commit is contained in:
commit
cda56fcbb4
|
@ -10,6 +10,7 @@ SparkleLib/SparklePaths.cs
|
|||
SparkleLib/SparklePlatform.cs
|
||||
SparkleLib/SparkleRepo.cs
|
||||
SparkleShare/Mac/SparkleStatusIcon.cs
|
||||
SparkleShare/Mac/SparkleUI.cs
|
||||
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
|
||||
SparkleShare/SparkleBubble.cs
|
||||
SparkleShare/SparkleDialog.cs
|
||||
|
|
Loading…
Reference in a new issue