.hgtags
author Benjamin Smedberg <benjamin@smedbergs.us>
Mon, 05 May 2008 13:39:59 -0400
changeset 14932 631ebb79c3f72e3d901f195f6e13197e973dcbe6
parent 4324 d39aec14c3e20e2b6e86ce9a14552374356775bd
child 15554 939c783149f367ad5c5ffc3d7e7000ec0ece5773
child 17223 18e5bb903af37da1e38f3ad3c2bc10ef40e78e85
permissions -rw-r--r--
Merge cvs-trunk-mirror to mozilla-central. Conflict resolution: * client.mk: new NSS tag merge to client.py

df7a3c8ffeeaba229067efee5a20e21dae0dd877 MOZILLA_1_9_a4_BASE
4209e16b58411750ac73f761023e46b76b793e2c MOZILLA_1_9_a6_BASE
66a5c7bce7ee86a820d3c0d54fa07cb719be751c MOZILLA_1_9_a7_BASE