| commit | 8e04e6ba83fd4c07221107660a6dfbf3a108cfac | |
| author | Valentin Villenave <valentin@localhost.(none)> | |
| Sat, 26 Apr 2008 22:20:05 +0000 (27 00:20 +0200) | ||
| committer | Valentin Villenave <valentin@localhost.(none)> | |
| Sat, 26 Apr 2008 22:20:05 +0000 (27 00:20 +0200) | ||
| tree | 39ab59ec2aebb1b3ba3b6f61aea680b00e604dd2 | treesnapshot (tar.gz zip) |
| parent | c513f57b977a610637299ed89432c62cdff8fd56 | commitdiff |
| parent | 3ea4f8c4a80641323000bc37acf2314d1dc74d97 | commitdiff |
Merge branch 'master' of git://repo.or.cz/opera_libre
Resolved conflict. This commit contains a breakage;
I still have to figure it out... :(
Conflicts:
definitions/functions.ly
Resolved conflict. This commit contains a breakage;
I still have to figure it out... :(
Conflicts:
definitions/functions.ly