Permalink
Browse files

Merge pull request #345 from ChrisMcKee/master

Fat Pull
  • Loading branch information...
2 parents 53ff2df + c6011e8 commit 3ff24a5092ce5963fd85aaf629553f355bd050da Code Computerlove committed Aug 22, 2012
Showing 3,152 changed files with 626,496 additions and 646,412 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -1 +1,2 @@
-release/*
+release/*
+/release
View
@@ -1,6 +1,6 @@
The MIT License
-Copyright (C) 2011 by Code Computerlove
+Copyright (C) 2011/2012 by Code Computerlove
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
View
@@ -1,3 +1,3 @@
cls
-call tools\apache-ant-1.8.2\bin\ant
+call tools\apache-ant-1.8.4\bin\ant
IF NOT %ERRORLEVEL% == 0 pause
View
@@ -1,3 +1,3 @@
-#Build Number for ANT. Do not edit!
-#Thu Jun 21 22:52:07 BST 2012
-build.number=41
+#Build Number for ANT. Do not edit!
+#Fri Jul 06 00:41:15 BST 2012
+build.number=50
View
@@ -5,12 +5,12 @@
project.description = PhotoSwipe
project.src.dir = src
-project.build.version = 3.0.5
+project.build.version = 3.0.5.1
project.build.year = 2012
project.build.workdir = work
project.build.artifactdir = release
lib.code.util.version = 1.0.6
-lib.jquery.version = 1.6.4
-lib.jqm.version = 1.0rc2
+lib.jquery.version = 1.7.1
+lib.jqm.version = 1.1.0
View
@@ -1,3 +1,3 @@
#!/bin/bash
clear
-tools/apache-ant-1.8.2/bin/ant
+tools/apache-ant-1.8.4/bin/ant
View
@@ -9,7 +9,9 @@
<taskdef name="jscomp" classname="com.google.javascript.jscomp.ant.CompileTask" classpath="tools/google-closure/compiler.jar" />
- <taskdef name="jslint" classname="com.googlecode.jslint4java.ant.JSLintTask" classpath="tools/jslint4java-2.0.0/jslint4java-2.0.0.jar" />
+ <taskdef name="jslint"
+ classname="com.googlecode.jslint4java.ant.JSLintTask"
+ classpath="tools/jslint4java-2.0.2/jslint4java-2.0.2.jar" />
<target name="build">
@@ -55,7 +57,7 @@
<target name="checkJS">
- <jslint options="browser,indent=0,plusplus,sloppy,white,indent=0,newcap,nomen,regexp,confusion,forin=true">
+ <jslint options="browser,indent=0,plusplus,sloppy,white,newcap,nomen,regexp,forin=true">
<formatter type="plain" />
<fileset dir="${project.src.dir}" includes="*.js" />
</jslint>
View
Binary file not shown.
@@ -159,6 +159,10 @@ div.ps-toolbar-play div.ps-toolbar-content
{
background-position: -88px 0;
}
+div.ps-toolbar-play-disabled div.ps-toolbar-content
+{
+ background-position: -88px -44px;
+}
/* Hi-res display */
@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 3ff24a5

Please sign in to comment.