The following commit has been merged in the patch/no_mac branch:
commit dc1969a65964894c04a0943230af439f61c6efb0
Merge: 725f52a1cfe5c8f4e35998da7fb995b493c56117
87975a17a0cae2bceae76ca9d1d68ba6799db207
Author: Giovanni Mascellani <[email protected]>
Date: Mon Dec 5 23:41:26 2011 +0100
Merge commit 'refs/top-bases/patch/no_mac' into patch/no_mac
Conflicts:
geogebra/gui/app/GeoGebraFrame.java
geogebra/gui/app/MacApplicationListener.java
--
GeoGebra: Dynamic mathematics software for education
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits