4pr0n 66671ff552 Merge branch 'master' into hotfix-updater ... Conflicts: pom.xml src/main/java/com/rarchives/ripme/ui/UpdateUtils.java		2014-04-08 23:35:39 -07:00
..
ripper	404'd images are marked as "errored" #13	2014-04-07 22:37:21 -07:00
ui	Merge branch 'master' into hotfix-updater	2014-04-08 23:35:39 -07:00
utils	404'd images are marked as "errored" #13	2014-04-07 22:37:21 -07:00
App.java	Notifications on rips when window is hidden #11	2014-04-07 21:59:47 -07:00