1. 06 Feb, 2015 1 commit
  2. 29 Sep, 2014 1 commit
  3. 25 Sep, 2014 1 commit
  4. 15 Aug, 2013 1 commit
  5. 05 Jan, 2013 1 commit
  6. 23 Oct, 2012 1 commit
  7. 12 Jan, 2012 1 commit
  8. 03 Nov, 2011 1 commit
  9. 02 Mar, 2011 1 commit
  10. 20 Feb, 2011 1 commit
  11. 16 May, 2010 1 commit
  12. 28 Apr, 2010 1 commit
  13. 16 Feb, 2010 1 commit
  14. 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
  15. 29 Aug, 2009 1 commit