Merge branch 'release-1.2' into develop

This commit is contained in:
seiichiro 2012-03-23 20:29:48 +01:00
commit 1349160c16

View file

@ -4,7 +4,7 @@
# n900-encode.py: Encode almost any Video to an Nokia N900-compatible format (h264,aac,mp4) # n900-encode.py: Encode almost any Video to an Nokia N900-compatible format (h264,aac,mp4)
# Disclaimer: This program is provided without any warranty, USE AT YOUR OWN RISK! # Disclaimer: This program is provided without any warranty, USE AT YOUR OWN RISK!
# #
# Version 1.1 (22.02.2012) # Version 1.2 (23.03.2012)
# #
# (C) 2010-2012 Stefan Brand <seiichiro@seiichiro0185.org> # (C) 2010-2012 Stefan Brand <seiichiro@seiichiro0185.org>
# #