~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
..
autoconf 68 18 years ago ben Adding the first stab at our cross-platform build Diff
msvc 712 17 years ago ben Bug 269 - "Add BUILD_ID to application.ini". MSVC Diff
autodefs.mk.in 12825 12 years ago Matt Parnell some more branding (at least on the top level and 9 KB Diff Download File
config.mk 9145 14 years ago preed Bug 16955: In thinking about this some more, I don 4.6 KB Diff Download File
file-autotargets.mk 9478 14 years ago preed git-svn-id: http://publicsvn.songbirdnest.com/cl 7.8 KB Diff Download File
File make-buildinfo.py 8449 15 years ago preed git-svn-id: http://publicsvn.songbirdnest.com/cl 2.5 KB Diff Download File
Makefile.in 12055 13 years ago preed -- Make sbBuildInfo.mk a variable, since we use it 1.2 KB Diff Download File
rules.mk 12702 12 years ago redfive dummy change to test upgraded svn poll script (sbB 51.2 KB Diff Download File
sbBuildInfo.mk.in 12828.1.6 12 years ago Matt Parnell Merge remote-tracking branch 'upstream/master' int 1.6 KB Diff Download File
tiers.mk 12179 13 years ago preed git-svn-id: http://publicsvn.songbirdnest.com/cl 3.2 KB Diff Download File