diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-09 23:28:39 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-09 23:28:39 -0600 | 
| commit | 16405fd3eb6f82ef3a709e3ed30fc48faef7b547 (patch) | |
| tree | c111819b3ba0c9357af41c81b798326b9df7adad /micropeak/MicroFrame.java | |
| parent | 5a2f6ed6210844f7284fbf9f7ecba68c8a14fa52 (diff) | |
| parent | 28bd5057252e61bc5b1a35a00bc1f9fdfde097f7 (diff) | |
Merge branch 'branch-1.5' into debian
Conflicts:
	ChangeLog
	Releasing
	altosui/Instdrv/NSIS/Includes/java.nsh
	altosui/altos-windows.nsi.in
	configure.ac
	doc/Makefile
	doc/altusmetrum.xsl
	micropeak/micropeak-windows.nsi.in
	telegps/telegps-windows.nsi.in
Diffstat (limited to 'micropeak/MicroFrame.java')
| -rw-r--r-- | micropeak/MicroFrame.java | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/micropeak/MicroFrame.java b/micropeak/MicroFrame.java index 5bfe5bf7..8b3d49b5 100644 --- a/micropeak/MicroFrame.java +++ b/micropeak/MicroFrame.java @@ -21,16 +21,16 @@ import java.awt.*;  import java.awt.event.*;  import javax.swing.*;  import java.util.*; -import org.altusmetrum.altosuilib_2.*; +import org.altusmetrum.altosuilib_3.*;  public class MicroFrame extends AltosUIFrame {  	static String[] micro_icon_names = { -		"/micropeak-16.png", -		"/micropeak-32.png", -		"/micropeak-48.png", -		"/micropeak-64.png", -		"/micropeak-128.png", -		"/micropeak-256.png" +		"/altusmetrum-micropeak-16.png", +		"/altusmetrum-micropeak-32.png", +		"/altusmetrum-micropeak-48.png", +		"/altusmetrum-micropeak-64.png", +		"/altusmetrum-micropeak-128.png", +		"/altusmetrum-micropeak-256.png"  	};  	static { set_icon_names(micro_icon_names); } | 
