Skip to content

Commit

Permalink
Merge branch 'compatiblebydefault'
Browse files Browse the repository at this point in the history
Conflicts:
	firefox/install.rdf
  • Loading branch information
Tim Kuijsten committed Feb 2, 2012
2 parents d02e632 + 640d2e6 commit 9fdf9d5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions firefox/install.rdf
Expand Up @@ -5,7 +5,7 @@


<Description about="urn:mozilla:install-manifest"> <Description about="urn:mozilla:install-manifest">
<em:id>googlesharing@extension.thoughtcrime.org</em:id> <em:id>googlesharing@extension.thoughtcrime.org</em:id>
<em:version>0.22.2</em:version> <em:version>0.23.1</em:version>
<em:type>2</em:type> <em:type>2</em:type>
<em:optionsURL>chrome://googlesharing/content/options.xul</em:optionsURL> <em:optionsURL>chrome://googlesharing/content/options.xul</em:optionsURL>
<em:iconURL>chrome://googlesharing/content/images/googlesharing.png</em:iconURL> <em:iconURL>chrome://googlesharing/content/images/googlesharing.png</em:iconURL>
Expand All @@ -16,8 +16,8 @@
<em:targetApplication> <em:targetApplication>
<Description> <Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.0</em:minVersion> <em:minVersion>9.0</em:minVersion>
<em:maxVersion>15.*</em:maxVersion> <em:maxVersion>10.*</em:maxVersion>
</Description> </Description>
</em:targetApplication> </em:targetApplication>


Expand Down

0 comments on commit 9fdf9d5

Please sign in to comment.