1. 30 Oct, 2009 1 commit
  2. 17 Sep, 2009 1 commit
    • jonnybradley's avatar
      [MRG] Manual merge - enventually done by using --ignore-ancestry and then... · f1b98b20
      jonnybradley authored
      [MRG] Manual merge - enventually done by using --ignore-ancestry and then reverting all (!?) the deleted things it had resurrected.
      
      I used this command: (svn 1.6 can do local merges - woo!)
      
      svn merge --depth=infinity -r 20961:HEAD --ignore-ancestry "/workspace/tiki-trunk" "/workspace/kaltura_integration_two"
      f1b98b20
  3. 16 Sep, 2009 1 commit
  4. 05 Sep, 2009 1 commit
  5. 04 Sep, 2009 1 commit
  6. 28 Aug, 2009 1 commit
  7. 11 Aug, 2009 1 commit
  8. 10 Aug, 2009 3 commits
  9. 04 Aug, 2009 1 commit
  10. 03 Aug, 2009 1 commit
  11. 02 Aug, 2009 3 commits
  12. 01 Aug, 2009 2 commits
  13. 27 Jul, 2009 1 commit
  14. 23 Jul, 2009 1 commit
  15. 15 Jul, 2009 1 commit
  16. 14 Jul, 2009 2 commits
  17. 10 Jul, 2009 3 commits
  18. 08 Jul, 2009 3 commits
  19. 26 Jun, 2009 1 commit
  20. 24 Jun, 2009 1 commit