The 
Treaty of Cahuenga ended the fighting of the 
Mexican-American War in 
California.  The treaty was signed by Lieutenant-Colonel 
John C. Fremont and General 
Andres Pico[?] on 
January 13, 
1847 on the kitchen table of 
Tomas Feliz[?]'s six-room adobe house. The following 
Treaty of Guadalupe Hidalgo in 
1848 formally ceded 
California to the United States and fixed the disputed border in 
Texas, ending hostilities with 
Mexico.