Merge branch 'release-1.1' into develop
This commit is contained in:
commit
c938df06ef
1 changed files with 3 additions and 1 deletions
|
@ -4,7 +4,9 @@
|
|||
# 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!
|
||||
#
|
||||
# (C) 2010-2011 Stefan Brand <seiichiro@seiichiro0185.org>
|
||||
# Version 1.1 (22.02.2012)
|
||||
#
|
||||
# (C) 2010-2012 Stefan Brand <seiichiro@seiichiro0185.org>
|
||||
#
|
||||
# This programm is licensed under the Terms of the GPL Version 3
|
||||
# See COPYING for more info.
|
||||
|
|
Loading…
Reference in a new issue