The University of Kansas School of Architecture, Design, and Planning (SADP), with its main building being Marvin Hall, traces its architectural roots to the creation of the architectural engineering degree program in KU's School of Engineering in 1912. The Bachelor of Architecture degree was added in 1920. In 1969, the School of Architecture and Urban Design (SAUD) was formed with three programs: architecture, architectural engineering, and urban planning. In 2001 architectural engineering merged with civil and environmental engineering. The design programs from the discontinued School of Fine Arts were merged into the school in 2009 forming the current School of Architecture, Design, and Planning.
With what two other programs was KU's architectural engineering curriculum joined in 2010?