Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=1a2be2a1aa91d5558273f527f53038bff15f80a4
commit 1a2be2a1aa91d5558273f527f53038bff15f80a4 Merge: 4d898e3 caee924 Author: Slown <[email protected]> Date: Sat Jun 9 20:44:01 2012 +0100 Merge branch 'master' of git.frugalware.org:/pub/other/people/slown/e17testing Conflicts: source/e17-extra/elementary/FrugalBuild source/e17-extra/emotion/FrugalBuild source/e17-extra/ethumb/FrugalBuild _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
