~rgerrday/nightingalemirror/master

  • Committer: unknown
  • Date: 2012-02-14 22:19:37 UTC
  • mfrom: (0.1.127)
  • Revision ID: git-v1:a0882e5bab99137bd463e27eb21cdb83331abbd8
Merge branch 'sb-trunk-oldxul', remote-tracking branch 'origin' into sb-trunk-oldxul

Conflicts:
Filename Latest Rev Last Changed Committer Comment Size
..
branding 826 17 years ago ben Renaming app/icons to app/branding. git-svn-id: h Diff
content 6 18 years ago ben Fix up chrome for dev-only builds git-svn-id: htt Diff
preferences 1 18 years ago ben Initial Import git-svn-id: http://publicsvn.songb Diff
profile 4621 16 years ago ben Bug 5500 - "text-link binding should do something Diff
skin 2377 17 years ago matt Bug 2223 - initial commit new global base and widg Diff
application.ini.in 12826 12 years ago Antoine Turmel replace the appid everywhere 395 bytes Diff Download File
blocklist.xml 7743 15 years ago mook bug 13634 - always ship a blocklist on trunk (r=pr 113 bytes Diff Download File
Info.plist.in 12599 12 years ago mikeh git-svn-id: http://publicsvn.songbirdnest.com/cl 19.9 KB Diff Download File
Makefile.in 12828.1.4 12 years ago Matt Parnell rename songbird.ini to nightingale.ini ...may have 1.6 KB Diff Download File
nightingale.ini.in 12828.1.4 12 years ago Matt Parnell rename songbird.ini to nightingale.ini ...may have 293 bytes Diff Download File
updater.ini 12828.1.4 12 years ago Matt Parnell rename songbird.ini to nightingale.ini ...may have 292 bytes Diff Download File
updater.plist 11221 14 years ago mook bug 20645 - invoke disthelper on mac update, songb 331 bytes Diff Download File