Skip to content

Commit

Permalink
Merge branch 'release/0.6.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
jezdez committed Apr 18, 2011
2 parents 5ae7ef1 + 0069d5a commit be0ea97
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Maciek Szczesniak
Mathieu Pillard Mathieu Pillard
Mehmet S. Catalbas Mehmet S. Catalbas
Petar Radosevic Petar Radosevic
Philipp Bosch
Philipp Wollermann Philipp Wollermann
Shabda Raaj Shabda Raaj
Thom Linton Thom Linton
Expand Down
2 changes: 1 addition & 1 deletion compressor/__init__.py
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = (0, 6, 3, "f", 0) # following PEP 386 VERSION = (0, 6, 4, "f", 0) # following PEP 386
DEV_N = None DEV_N = None




Expand Down
2 changes: 1 addition & 1 deletion compressor/filters/closure.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
class ClosureCompilerFilter(CompilerFilter): class ClosureCompilerFilter(CompilerFilter):
command = "{binary} {args}" command = "{binary} {args}"
options = { options = {
"binary": settings.COMPRESS_CLOSURE_COMPILER_ARGUMENTS, "binary": settings.COMPRESS_CLOSURE_COMPILER_BINARY,
"args": settings.COMPRESS_CLOSURE_COMPILER_ARGUMENTS, "args": settings.COMPRESS_CLOSURE_COMPILER_ARGUMENTS,
} }
5 changes: 5 additions & 0 deletions docs/changelog.txt
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog Changelog
========= =========


0.6.4
-----

- Fixed Closure compiler arguments.

0.6.3 0.6.3
----- -----


Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# The short X.Y version. # The short X.Y version.
version = '0.6' version = '0.6'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.6.3' release = '0.6.4'


# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
Expand Down

0 comments on commit be0ea97

Please sign in to comment.