List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:December 20 2010 1:27pm
Subject:bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3450 to 3451)
View as plain text  
 3451 Tor Didriksen	2010-12-20 [merge]
      Empty merge opt-team => trunk-bugfixing

 3450 Tor Didriksen	2010-12-20 [merge]
      Merge 5.5-bugteam => trunk-bugfixing
      
      text conflict: include/CMakeLists.txt

    modified:
      include/CMakeLists.txt
      scripts/mysql_config.sh
      sql/sql_select.cc
      support-files/CMakeLists.txt
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3450 to 3451) Tor Didriksen20 Dec