Commit Graph

2 Commits

Author SHA1 Message Date
Bharat Mediratta
76411d7d6d Rename BUILD_NUMBER to .build_number so it's not so loud. 2011-01-17 17:34:19 -08:00
Bharat Mediratta
6849581448 Specify that we don't want the BUILD_NUMBER changes that happen in other branches
by using a custom merge-keep-ours merge algorithm.
2011-01-16 17:01:03 -08:00