Viewing all changes in revision 90.2.5.
- Committer: Chris Townsend
- Date: 2013-03-19 14:47:46 UTC
- mfrom: (93 trunk)
- mto: This revision was merged to the branch mainline in revision 94.
- Revision ID: christopher.townsend@canonical.com-20130319144746-ed1wzmpt0rdfgh6b
Merge in from trunk and fix conflict in debian/control.
- files added:
- debian/account-plugin-generic-oauth.install
- files removed:
- src/facebook.vala
- files renamed:
- data/providers/facebook.provider.in => data/providers/facebook.provider.in.in
- data/providers/flickr.provider.in => data/providers/flickr.provider.in.in
- data/providers/foursquare.provider.in => data/providers/foursquare.provider.in.in
- data/providers/google.provider.in => data/providers/google.provider.in.in
- data/providers/identica.provider.in => data/providers/identica.provider.in.in
- data/providers/sina.provider.in => data/providers/sina.provider.in.in
- data/providers/sohu.provider.in => data/providers/sohu.provider.in.in
- data/providers/twitter.provider.in => data/providers/twitter.provider.in.in
- data/providers/windows-live.provider.in => data/providers/windows-live.provider.in.in
- files modified:
- .bzrignore
expand all
collapse all
added
removed
