| 
						
					 | 
					
						
						
							
						
						7687396bf7
					 | 
					
						
						
							
							Merged testing into master
						
						
						
						
						
						
					 | 
					
						2013-08-09 01:02:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e5e9db796
					 | 
					
						
						
							
							Merged in silvernode (pull request #13)
						
						
						
						
						
						
						
						temporary fix for error caused by ' 
						
						
					 | 
					
						2013-08-09 01:00:51 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be4a1551aa
					 | 
					
						
						
							
							temporary fix for error caused by '
						
						
						
						
						
						
					 | 
					
						2013-08-08 16:02:57 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f7d137304
					 | 
					
						
						
							
							Merge branch 'master' of https://bitbucket.org/silvernode1/mandy
						
						
						
						
						
						
					 | 
					
						2013-08-08 15:24:19 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b40beef785
					 | 
					
						
						
							
							small cleanup
						
						
						
						
						
						
					 | 
					
						2013-08-07 05:04:07 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a2ef26d215
					 | 
					
						
						
							
							Merge branch 'testing' of https://bitbucket.org/silvernode1/mandy into testing
						
						
						
						
						
						
					 | 
					
						2013-08-06 22:36:31 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						652055d6bd
					 | 
					
						
						
							
							Merge branch 'silvernode' into testing
						
						
						
						
						
						
					 | 
					
						2013-08-06 22:35:28 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						913d126d13
					 | 
					
						
						
							
							Took out misleading info in README
						
						
						
						
						
						
					 | 
					
						2013-08-06 22:34:32 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8435ea7155
					 | 
					
						
						
							
							Merged testing into master
						
						
						
						
						
						
					 | 
					
						2013-08-06 15:41:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0cb8e48230
					 | 
					
						
						
							
							Merged in experimental (pull request #12)
						
						
						
						
						
						
						
						new main dialog options: bitrate, play finished file and changelog viewer 
						
						
					 | 
					
						2013-08-06 15:32:06 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f56dad78d6
					 | 
					
						
						
							
							forgot to remove something that didn't work
						
						
						
						
						
						
					 | 
					
						2013-08-06 15:23:21 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09706f706d
					 | 
					
						
						
							
							added a comment
						
						
						
						
						
						
					 | 
					
						2013-08-06 15:19:44 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c409825057
					 | 
					
						
						
							
							changed #!/usr/bin/env lua and kb/s to kbps for bitrate
						
						
						
						
						
						
					 | 
					
						2013-08-05 18:41:16 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7a42ec87ad
					 | 
					
						
						
							
							cleaned up pointless gBitrate crap and the extra y param
						
						
						
						
						
						
					 | 
					
						2013-08-05 18:07:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f99c3bbfd7
					 | 
					
						
						
							
							Revert "Revert "added -vn to ffmpeg function""
						
						
						
						
						
						
						
						This reverts commit d36d657ecd. 
						
						
					 | 
					
						2013-08-05 07:48:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f4731d488a
					 | 
					
						
						
							
							Revert "Revert "Added a cfg file, poorly.""
						
						
						
						
						
						
						
						everything was screwed
This reverts commit f9f328df29. 
						
						
					 | 
					
						2013-08-05 07:45:58 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf81bd3369
					 | 
					
						
						
							
							Main dialog: bitrate, play file dropdown, changelog viewer
						
						
						
						
						
						
					 | 
					
						2013-08-05 07:22:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						007ff260f7
					 | 
					
						
						
							
							Added bitrate options
						
						
						
						
						
						
					 | 
					
						2013-08-05 04:10:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e59b9cf3f4
					 | 
					
						
						
							
							updated branch
						
						
						
						
						
						
					 | 
					
						2013-08-05 01:00:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9f328df29
					 | 
					
						
						
							
							Revert "Added a cfg file, poorly."
						
						
						
						
						
						
						
						broken when using ogg
This reverts commit 11f74a47d8. 
						
						
					 | 
					
						2013-08-04 03:08:45 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d36d657ecd
					 | 
					
						
						
							
							Revert "added -vn to ffmpeg function"
						
						
						
						
						
						
						
						learning
This reverts commit c21b96fd81. 
						
						
					 | 
					
						2013-08-04 03:02:49 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cd7633034c
					 | 
					
						
						
							
							learning
						
						
						
						
						
						
					 | 
					
						2013-08-04 03:02:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9debac93de
					 | 
					
						
						
							
							Revert "added -vn to ffmpeg function"
						
						
						
						
						
						
						
						This reverts commit c21b96fd81. 
						
						
					 | 
					
						2013-08-04 02:58:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						11f74a47d8
					 | 
					
						
						
							
							Added a cfg file, poorly.
						
						
						
						
						
						
					 | 
					
						2013-08-04 02:58:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ade76e4200
					 | 
					
						
						
							
							added -vn to ffmpeg function
						
						
						
						
						
						
					 | 
					
						2013-08-04 02:58:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						74a879ab85
					 | 
					
						
						
							
							failed at ffmpeg bar, now delete temp flv
						
						
						
						
						
						
					 | 
					
						2013-08-04 02:58:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8866f16b33
					 | 
					
						
						
							
							Merged in logen_kain (pull request #11)
						
						
						
						
						
						
						
						Added a cfg file, poorly 
						
						
					 | 
					
						2013-08-04 02:35:09 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						5785087ee1
					 | 
					
						
						
							
							Added a cfg file, poorly.
						
						
						
						
						
						
					 | 
					
						2013-08-03 17:36:45 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c21b96fd81
					 | 
					
						
						
							
							added -vn to ffmpeg function
						
						
						
						
						
						
					 | 
					
						2013-08-03 13:28:51 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af4e9c2c56
					 | 
					
						
						
							
							Merged in logen_kain (pull request #10)
						
						
						
						
						
						
						
						Temp files 
						
						
					 | 
					
						2013-08-03 04:51:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						154958d5de
					 | 
					
						
						
							
							failed at ffmpeg bar, now delete temp flv
						
						
						
						
						
						
					 | 
					
						2013-07-31 21:35:58 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								logen_kain
							
						 
					 | 
					
						
						
							
						
						d7d3cc53bf
					 | 
					
						
						
							
							Merged in silvernode (pull request #9)
						
						
						
						
						
						
						
						Implemented audio format selection for mp3, ogg, and flac 
						
						
					 | 
					
						2013-07-31 16:15:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ee6f528cf0
					 | 
					
						
						
							
							change screenshot in README to reflect latest version
						
						
						
						
						
						
					 | 
					
						2013-07-31 04:22:42 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						16e4ebf9f1
					 | 
					
						
						
							
							Updated changelog, TODO, and changed version number in README and main dialog
						
						
						
						
						
						
					 | 
					
						2013-07-31 02:56:26 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d8c206c2a
					 | 
					
						
						
							
							Implemented audio format selection for ogg, mp3, and flac
						
						
						
						
						
						
					 | 
					
						2013-07-31 02:29:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bfae1feed1
					 | 
					
						
						
							
							reverted spaces to testing version
						
						
						
						
						
						
					 | 
					
						2013-07-30 15:47:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cea0ad69dc
					 | 
					
						
						
							
							Merged in logen_kain (pull request #8)
						
						
						
						
						
						
						
						Fixed your problem correctly 
						
						
					 | 
					
						2013-07-30 14:18:18 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						de7fe89d10
					 | 
					
						
						
							
							fixed your problem
						
						
						
						
						
						
					 | 
					
						2013-07-30 11:07:49 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						293fbb3d64
					 | 
					
						
						
							
							Fixed ommited spaces issue in file name
						
						
						
						
						
						
					 | 
					
						2013-07-30 06:20:38 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						a8d95449a1
					 | 
					
						
						
							
							fixed flag
						
						
						
						
						
						
					 | 
					
						2013-07-29 22:55:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						c145e73a30
					 | 
					
						
						
							
							Fixed various cancle flags to act properly.
						
						
						
						
						
						
					 | 
					
						2013-07-29 22:49:23 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						5f470e54ee
					 | 
					
						
						
							
							updated TODO
						
						
						
						
						
						
					 | 
					
						2013-07-29 22:48:36 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3be6ebcf68
					 | 
					
						
						
							
							Merge branch 'silvernode' of https://bitbucket.org/silvernode1/mandy into silvernondde
						
						
						
						
						
						
					 | 
					
						2013-07-29 22:19:26 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9aceab941e
					 | 
					
						
						
							
							small cleanup
						
						
						
						
						
						
					 | 
					
						2013-07-29 22:15:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						64457741b3
					 | 
					
						
						
							
							created changelog file, added current version number to README
						
						
						
						
						
						
					 | 
					
						2013-07-29 22:15:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						26886d4de7
					 | 
					
						
						
							
							modified anon contribute
						
						
						
						
						
						
					 | 
					
						2013-07-29 21:59:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						d4ca8389b8
					 | 
					
						
						
							
							Updated Contributer License
						
						
						
						
						
						
					 | 
					
						2013-07-29 21:59:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						633e72c9ab
					 | 
					
						
						
							
							Updated Contributers
						
						
						
						
						
						
					 | 
					
						2013-07-29 21:59:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						072532d506
					 | 
					
						
						
							
							Licenses agreement
						
						
						
						
						
						
					 | 
					
						2013-07-29 21:59:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Logen Kain
							
						 
					 | 
					
						
						
							
						
						92adc9470f
					 | 
					
						
						
							
							Licenses agreements added.
						
						
						
						
						
						
					 | 
					
						2013-07-29 21:59:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |