team4alfanous team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  zsmahi <zakaria08esi@xxxxxxxxx>
------------------------------------------------------------
revno: 289 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Wed 2012-08-08 18:51:29 +0100
message:
  Merge branch 'master' of git://github.com/zsmahi/alfanous
  
  Conflicts:
  	interfaces/toolbars/firefox/chrome.manifest
  	interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.js
  	interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul
  	interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css
  	interfaces/toolbars/firefox/install.rdf
  	interfaces/toolbars/firefox/make.sh
added:
  interfaces/toolbars/firefox/chrome/skin/.directory
  interfaces/toolbars/firefox/chrome/skin/alfanous.png
  interfaces/toolbars/firefox/chrome/skin/cms.png
  interfaces/toolbars/firefox/chrome/skin/fb.png
  interfaces/toolbars/firefox/chrome/skin/g+.png
  interfaces/toolbars/firefox/chrome/skin/gh.png
  interfaces/toolbars/firefox/chrome/skin/lp.png
  interfaces/toolbars/firefox/chrome/skin/search.png
  interfaces/toolbars/firefox/chrome/skin/sf.png
  interfaces/toolbars/firefox/chrome/skin/t.png
  interfaces/toolbars/firefox/chrome/skin/wiki.png
modified:
  interfaces/toolbars/firefox/chrome.manifest*
  interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.js*
  interfaces/toolbars/firefox/chrome/content/alfanoustoolbar.xul*
  interfaces/toolbars/firefox/chrome/skin/alfanoustoolbar.css*
  interfaces/toolbars/firefox/chrome/skin/gripper.png*
  interfaces/toolbars/firefox/install.rdf*
  interfaces/toolbars/firefox/make.sh
The size of the diff (1019 lines) is larger than your specified limit of 500 lines

--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription