[mkvtoolnix: 9/9] Merge remote branch 'origin/f13/master'

[Dominik Mierzejewski]

commit 44140a90ca5ecaf53cf86681c2e8bbbdff809cfa
Merge: bc0ea2f e73bbc3
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Mon Nov 15 22:46:38 2010 +0100

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	mkvtoolnix.spec
    	sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --cc sources
index 5b31b72,b61cf5b..c1527b7
--- a/sources
+++ b/sources
@@@ -1,5 -1,1 +1,1 @@@
- <<<<<<< HEAD
 -a002b6537e4515b6a0b26f42e8a2eb9a  mkvtoolnix-3.3.0.tar.bz2
 +de3e99598d47d0a2226269f79faabbfd  mkvtoolnix-4.2.0.tar.bz2
- =======
- a002b6537e4515b6a0b26f42e8a2eb9a  mkvtoolnix-3.3.0.tar.bz2
- >>>>>>> origin/f12/master