Public Git Hosting - LameXP.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d44c57e 9e83f4c)

commit	7a04d503eb5a1b12cdf31fd5dce09f8d617168bf
author	lordmulder <mulder2@gmx.de>
	Sun, 29 Jul 2012 14:56:42 +0000 (29 16:56 +0200)
committer	lordmulder <mulder2@gmx.de>
	Sun, 29 Jul 2012 14:56:42 +0000 (29 16:56 +0200)
tree	bee0004764e50fd62e81ef5e8f1afbca796ed13b	tree \| snapshot (tar.gz zip)
parent	d44c57e0096c2943e96b8458abc48a787baf7243	commit \| diff
parent	9e83f4cf0a789084c2208194cfd66e0083c883f8	commit \| diff

Merge branch 'master' of github.com:lordmulder/LameXP

Conflicts:
etc/Translation/LameXP_UK.ts

Audio Encoder Front-End (Qt)