Commit Graph

16298 Commits (4fbe80cc637eb52d1a2e2cae83ea9c0cb7abdfbf)
 

Author SHA1 Message Date
Mark Michelson 4fbe80cc63 This is the 1.6.0 version of revision 156883 of trunk.
18 years ago
Mark Michelson bd31630ab0 Merged revisions 156817 via svnmerge from
18 years ago
Brandon Kruse dbc2ed5e21 Update to Coding Guidelines
18 years ago
Brandon Kruse f077cc197d Merged revisions 156017 via svnmerge from
18 years ago
Steve Murphy 6db3b2ff26 Merged revisions 156299 via svnmerge from
18 years ago
Tilghman Lesher 71cc37f431 Merged revisions 156243 via svnmerge from
18 years ago
Mark Michelson 221444dd9c Merged revisions 156169 via svnmerge from
18 years ago
Russell Bryant 62eefbec73 Don't blow up if we get NULL when trying to parse out the full name field
18 years ago
Michiel van Baak 1611c5af38 remove prop that shouldn't be here
18 years ago
Tilghman Lesher 3e62b69b3c Merged revisions 155862 via svnmerge from
18 years ago
Tilghman Lesher 57421957b6 Merged revisions 155804 via svnmerge from
18 years ago
Sean Bright 0591cc3029 Merged revisions 155554 via svnmerge from
18 years ago
Mark Michelson ac9e7f492a Merged revisions 155467 via svnmerge from
18 years ago
Mark Michelson e69fb8b298 Merged revisions 155360 via svnmerge from
18 years ago
Kevin P. Fleming 3577a3c7ca Merged revisions 155121 via svnmerge from
18 years ago
Mark Michelson d5e144b150 Merged revisions 155012 via svnmerge from
18 years ago
Tilghman Lesher 975b8d582e Recorded merge of revisions 154072 via svnmerge from
18 years ago
Tilghman Lesher c8ebf2045a Merged revisions 154060 via svnmerge from
18 years ago
Kevin P. Fleming 090cd16d68 record revisions that were manually merged
18 years ago
Kevin P. Fleming ede179faec Merge revision 153709 from trunk
18 years ago
Kevin P. Fleming fa635ea4b0 port gcc 4.3.x warning fixes from trunk to this branch
18 years ago
Terry Wilson e23be17786 Merged revisions 153181 via svnmerge from
18 years ago
Sean Bright 798db6fe3b Merged revisions 152993 via svnmerge from
18 years ago
Kevin P. Fleming 3a6940fe60 Merged revisions 152812 via svnmerge from
18 years ago
Tilghman Lesher 68ccb25f93 Merged revisions 152765 via svnmerge from
18 years ago
Mark Michelson 84dcf8e6b1 Merged revisions 152646 via svnmerge from
18 years ago
Terry Wilson 969bef1dea Small modification to putnopvut's patch to fix this issue. Thanks for all the help, putnopvut!
18 years ago
Tilghman Lesher 01cea8d69d Merged revisions 152442 via svnmerge from
18 years ago
Tilghman Lesher 8bcea43631 Merged revisions 152134 via svnmerge from
18 years ago
Sean Bright 85b4dc5b11 Merged revisions 152060 via svnmerge from
18 years ago
Russell Bryant 4ebe1cfd46 Fix some memory leaks. These issues are 1.6.0 specific.
18 years ago
Kevin P. Fleming ff6a34c1c5 Merged revisions 151242-151243 via svnmerge from
18 years ago
BJ Weschke b15c8d915a Merged revisions 150817 via svnmerge from
18 years ago
Mark Michelson 6e93187aa1 Instead of merging commit 150307 to 1.6.0, I had
18 years ago
Mark Michelson 258c4d4932 Merged revisions 150307 via svnmerge from
18 years ago
Richard Mudgett 757367c8d8 Merged revisions 150125 via svnmerge from
18 years ago
BJ Weschke a301889274 Merged revisions 149756 via svnmerge from
18 years ago
Kevin P. Fleming 962a134bcf Merged revisions 149487 via svnmerge from
18 years ago
Mark Michelson 4e93c2a778 Merged revisions 148913 via svnmerge from
18 years ago
Kevin P. Fleming f9f88ad2d8 Merged revisions 148738 via svnmerge from
18 years ago
Kevin P. Fleming 158d6c4b64 Merged revisions 148612 via svnmerge from
18 years ago
Steve Murphy 3a39286358 Blocked revisions 148519 via svnmerge
18 years ago
Mark Michelson 2e7e3ee6b3 Merged revisions 148373 via svnmerge from
18 years ago
Sean Bright eb87d6dac7 Merged revisions 148200 via svnmerge from
18 years ago
Sean Bright 2b03afb74b Somehow we got conflict markers checked in! Might need a 1.6.0.1 sooner than we'd like.
18 years ago
Mark Michelson 60399ff4ac Merged revisions 148144 via svnmerge from
18 years ago
Tilghman Lesher e0f75e891e Merged revisions 148120 via svnmerge from
18 years ago
Michiel van Baak de553c362d Merged revisions 147899 via svnmerge from
18 years ago
Tilghman Lesher 2934507592 Merged revisions 147896 via svnmerge from
18 years ago
Steve Murphy 062d3041fe Merged revisions 147807 via svnmerge from
18 years ago