labofsahil/github-event-dataset-2012 huggingface dataset:
* ext/openssl/ossl_ssl.c: Allow disabling client-side renegotiation.
* test/openssl/test_ssl.rb: Simple tests for this.

  Client-side renegotiation is still considered problematic, even
  when used in the context of secure renegotiation (RI, RFC 5746).
  The changes allow users to either completely disable client
  renegotiation on the server, or to specify a maximum number of
  handshakes allowed in total. The number of total handshakes is
  counted in a callback set as SSL_set_info_callback. If the
  maximum number of handshakes is exceeded an error will be raised
  We do not support renegotiation in the OpenSSL extension, therefore
  this feature can only be tested externally.
  The feature is opt-in, the default setting will be to allow
  unlimited client renegotiation, as was the case before.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2012-05-26

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* time.c: Documentation improvements, grammar and formatting
  Patch by Bernd Homuth [ruby-core:49203] [Bug #7326]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* string.c (rb_str_crypt): crypt(3) may return NULL.
  Latest glibc (2.16?) crypt(3) actually returns NULL. [Bug #7312]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fixed syntax

- isinstance
src/runtime/sparc-arch.c: Use si_addr in arch_get_bad_addr().

  * Since the sparc port was first merged, arch_get_bad_addr() has
only worked when the program counter is within read-only or the
current dynamic space.

  * This is fragile simply because of the existance of static
space and PURIFY.  It is WORSE when you add GENCGC to the mix (to
the point where SunOS with GENCGC doesn't even call
arch_get_bad_addr() anymore).

  * The existing implementation looks like it predates the switch
to sigaction(2) style signal handlers.  SBCL uses si_addr on all
other backends save Alpha (long undermaintained) and HPPA (even
longer undermaintained).  Clearly, this approach works on SunOS.
From testing, it works on at least linux-2.6.32.  We might as well
run with it, since we need it for GENCGC anyway, and we can easily
concoct a test case that would cause a failure using CHENEYGC.

  * So, implementation patterned on any of the other backends, but
leaving the old code in place, conditional-compiled out, as a bit
of a historical note / warning to future historians.
GENCGC on SPARC/Linux

  * Tweak make-config.sh to automatically select GENCGC, and to
update the fallback message for those poor bsd-using folks.

  * Copied the gencgc memory map from the SunOS version to use for
Linux (the cheneygc maps were identical, we may as well keep the
parallelism).

  * Also tweaked the linker flags to match.  Not because it was
required to build, but because I don't know why they were changed
for SunOS, and in the absence of such knowledge I'd rather keep
things more or less parallel.
Disable an SB-INTROSPECT test on GENCGC SPARC.

  * Test ALLOCATION-INFORMATION.4 is known to be flaky at best on
GENCGC PPC, and has been observed to fail on GENCGC SPARC.  Since
it's been marked :FAILS-ON for GENCGC PPC, mark it as failing for
GENCGC SPARC as well.
.gitignore: Add src/runtime/sparc-funcdef.h

  * Just another auto-generated file for a rarely-maintained
target.
fix upload empty dir error
Works are sorted DESC
$stdout=sync #21
rescue tweet duplicate error #10 #21
pipe tweet each lines from STDIN
ignore false updates
Add another ls-correction optimization and GCD computations
Correct handling of Phi nodes in write machine crash constraint
construction.  If we encounter a Phi, that means we're assigning to
the target register, which resolves the original phi, and we replace
it with the new one rather than trying to merge them.
Simplify Phi expressions with a single antecedent into simple Gets.
Sometimes, a Phi can reach the top of the machine, if the machine
depends on the initial value of a register.  Handle this correctly.
Better optimisation of Phi nodes.  If we know that register x:y is a
phi of register x:z, and we encounter a Phi which depends on x:y, we
can rewrite it to depend on x:z.

(i.e. we can sometimes forward results from one Phi node to another)
Better alias checking.  If the simplifier can show that two things
don't alias then there's no point checking the tags database.
The write machine suitability constraint is a predict on machine
states, P, such that for any state S which satisfies P:

-- Running the read machine in S leads to a non-crash
-- Running the write machine in S causes the write machine to reach a crash
   state, and running the read machine from that state also leads to
   a non-crash.

We already have a predict P' which is true of states where running the
read machine leads to a non-crash, so we can instead compute P'' such
that running the write machine from a P'' state causes the write
machine to crash in a P' state.  That's pretty much precisely what
writeMachineCrashConstraint does, so just use that.  This is *much*
faster than the current interpretation-based approach (multiple orders
of magnitude), although deriving the suitability constraint is usually
a relatively small fragment of total run time, so it's not that big a
win overall.
Add timeout points to getStoreCFGs, since it can sometimes be quite
expensive.
Extra checking of SSA-ness.
Whoops: the result of CFGtoCrashReason isn't in SSA form.
Get rid of a bogus assertion.  There's no particular reason why every
definition of register X which reaches a PhiX needs to be in the
PhiX's input set.
Rework SSA optimisation so that it actually uses the right reaching
set for generation reduction.

The problem is that when introducing SSA variables we need to consider
all generations as equivalent, for reachability purposes, but when
optimising them we need to keep them distinct.  Dealing with this
means parameterising a lot of intermediate functions; sigh.
Another SSA sanity check.
SSA conversion should return NULL on timeout, not inp, because inp is
not in SSA form.
Whoops: fix a type error in the simplifier.  When doing x - x = 0,
it's important to make sure that the 0 has the right type.
Convert a bit of SSA conversion from explicit indexes into the
sideEffects list to an iterator form.
Cached expressions in Phi side effects need to keep registers alive.
Fix some compiler warnings.
Fix an infinite loop in state machine optimisation.
Yet more SSA sanity checking.
Rework state machine evaluation to use iterators rather than explicit
indexes into the side effect lists.
masks and millwork percentage
support proxy source upload fix #478
yt support modified
Add Yandex.Metrics
Learning d3.js, will work out an sample chart
Merge branch 'master' of github.com:tarkus/d3
[Bug 3598580]: Tcl_ListObjReplace may release deleted elements too earl
[Bug 3598580]: Tcl_ListObjReplace may release deleted elements too early
[Bug 3598580]: Tcl_ListObjReplace may release deleted elements too early
Sexp.assoc utility
Starting on RealD demo
Parameterized backdrop model url
x0d: first attempt to fix --instant mode
Coaches have a list of tutors and can see their rehearsals.
fixed events index, penalty from events add and edit

Some of the redirect links after adding event for example has a message
appeneded to the url, which caused the index not to work, which I fixed.
I've also fixed some links that were not working.

I've also fixed penalty, that seemed to be set to active whether we choose
to make it active or not when we add an event. It now only adds penalty to
the penalties table when "Yes" is selected. Also when a user edits their
event from having penalty to NOT have penalty, the entries in penalties
will be deleted.

I've also added a field in the view events page to view the penalty details.
created tests for penalties

The tests are based on the sample data from the database.
\LTR@outputdblcol needs to be modified too
initial commit comment
Merge branch 'master' of github.com:val62/mcs
technika ate change
don't let nanny thread for timeout prevent JVM exit
Move hosted files (pdfs, etc.) from disneyanimation.com to amazonaws.
added repository and distribution deletion and tests
cosmetic: silent compiler warning
album replaygain was set into the track replaygain tag. Fixes #13368
fixes embedded art not being read from FLAC files
fixes translation of POPM ratings for winamp, among others. Part of #13352
TDRL in ID3v2.4 tags (release date) wasn't read. Also read TDRC (original recording date), and don't bother warning about known tags that we don't support. Fixes #13352
ALBUM ARTIST and DATE weren't read in Xiph (FLAC/Ogg) tags. Also adds ignoring of ENSEMBLE
Provide a configure switch for libssh.
default is enabled
Merge pull request #1316 from wsnipex/master

configure switch for ssh support
[AE/CA] - fix build on case-sensitive filesystems.
Merge pull request #1240 from jingai/caae_cs_fs

[AE/CA] - fix build on case-sensitive filesystems.
add a warning to the log indicating when files aren't added to the library
[gles] - query the max texture size from GLES instead of assuming 2048 (new ipad has 4096 for example)
Merge pull request #1028 from Memphiz/texturesize

[gles] - query the max texture size from GLES instead of assuming 2048 (...
[dvdplayer] remove old disabled looping still frame handling code

Disabled code that should be written differently if we
every need it again.
[dvdplayer] remove old delayed processing of player sync

It should not be needed with the new handling of continuity
and the change most likley fixes issues with EDL seeking
causing long delays.
[dvdplayer] rewrite syncronization message to be more efficient

This new sync message will now wakeup directly on object release
to check situation. It should reduce any scheduling delay that
previous implementation had.
[dvdplayer] push back sync objects in message queue to process prio message

Note, this could be moved into message queue and hidden from players
but i'm not sure it's that beneficial.
[dvdplayer] restore proper starttime behaviour

It should represent first dts of stream and is used to add start delays
to individual streams that start later than their sibling streams.

This got broken by cd36abfd9763c63753853483bfa9b17f2edd8b73 then further code started depending on the broken behaviour.
[dvdplayer] replace DWORD by unsigned in for sync object handling
Merge pull request #1084 from elupus/dvdsync

improve dvdplayer synchronization objects
personalize cpp syntax and colors
More pretty printing proof.
Add orderAttrs for explicitly specified ordering of attributes.
Updates

- Add MiiDownEdge (so we can now bring the iface down as well, whee!
- Disable contracts for now, since they segfault the compiler.
Merge branch 'master' of github.com:zhr/ziher
0.5.2-2
Fix ensurePortrait()
Extend closeErrorBox() to support Android
Merge pull request #7 from leeyt/master

Fix bug and extend functionality
Nothing but file paths.
bin: psearch'e biraz bakım gerekiyor
set inline functions
optimization comments
set __attribute__((always_inline)) at the statement's begin
add PROGMEM macro
LOG macro maps all Serial.print
explain PROGMEM usage
send body from flash memory
clean
refactor name + DEBUG move to config.h
tested
added ignore rule for bin/
small type change to login btn for socialauth/openid
Merge branch 'master' of github.com:CoJMC/jaam
Added some files to the ignore list
Added the New directory

Signed-off-by: Dasaan <mrloquax@googlemail.com>
report finalized and submitted
engine: restart immediately if packets are queued
Moved transaction code to the Connection class.
Start mnesia on all nodes.
Correction de bugs CVtheque
Correction de bugs CVtheque
fixed logic bug
added test code
Add Lights Library Config
Core,Net: Use atom::Map in NetSelect and improve it

Signed-off-by: Nicolas Iooss <nicolas.iooss@polytechnique.org>
Set up django stuff
moose: tidy
client: fix error handling breakage caused by refactoring
start kanban page
show username in kanban.
created garden gnome class extending enemy
basic structure for 1000px width
Simple Trap
support for update_with_media

See here for more information
https://dev.twitter.com/docs/api/1/post/statuses/update_with_media
WRAM, instruction corrections
Corrections Linux (mutex + events) + Changement des SceneX en X
Signed-off-by: Schada <schada@orange.fr>
if(SkipBlockNandFlash_Initialize
to be honest I'm testing Kdev cvs
clean mainc
added datatables sorting
Added static widget images, removed old ones
Latest version
fixed error in selector for removing hover effect on tables
math stat - assignment, minor changes for #5
クエリ画像の選択．
pre alpha version for writer stats.txt
Updated Transaction ID and message parsing in Branch GUI

Signed-off-by: Risa Naka <rn96@cs.cornell.edu>
fixed server side player disconnect
[#35002457] re added error message
pakeitimai pakeitimai
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/order/form.php
add delete php version
deleting redundant refactoring
Adding template method pattern samples
doc template method
command pattern adding samples
Ignore generated package
Improving splitTokens
Remove vim-irblack (problem with submodule decl)
temporary remove simple content, this is a bug
update uaa to latest
added blog description after blog name
BUGFIX to interrupt cutter compensation at ARC
Merge branch 'master' of github.com:artek/emc2
add one api to retrieve last motion line.
Fixed loop scripts to correctly import external jars from lib directory to classpath.
graphics
graphics
graphics
Еще раз
Merge remote-tracking branch 'origin/master'
Add a test case for `CompiledObject: native_object`

This also builds a simple `caml_startup` wrapper and executes the binary to ensure that it works, and includes two compilation units.
Install freebsd files to proper directories based on hier(7)

FreeBSD defines the system hierarchy in the hier(7) manpage. This commit installs Riak based upon that directory structure.
Use proper -R flag for copy command
Install Riak files in proper FreeBSD directories
Merge pull request #174 from basho/jem-proper-freebsd-dirs

Install freebsd files to proper directories based on hier(7)
Nuevas tipografías instaladas en el sitio

Agregado la nueva tipografia en archivo de catalogo
to-do : agregar a todas las vistas html actuales
netcdf reader now allows for lat/lon being either first two or last two nc variables. also, latitude variable does not need to have lower dimension than longitude variable any more.
Merge pull request #412 from bendk/updatesegmenter

Update segmenter code to not use deprecated functions
Fix upgrade192

There were 2 issues: 1: we were running it on the wrong database and 2: it
didn't work.  I'm not sure what I was thinking when I checked it in.
Added full-text search for device databases.

Added a databaseupgrade to convert old databases.  Made it so wo don't show
the upgrade progress dialog for device databases.
utf8, nullpointer exception
Improved unixsocket buffering issues a bit
tweaked templatizr demo page controller
Story #41449685: implemented using SQLite as requested
Story #41449685: small refactorings & cleanup
v3 API: Fix clone command
Remove 5.3.2 from travis config
- bind varaible with ":"
- keep options start without ":"
now variable is bind with ':' char
Update doc string
extensionSupport flag
check enable_extension option
Add build.xml for extension
define subproject in build.xml
Add runWrapper method to controller
refactor controller runner
Rename createController to createObjectFromReflection
more refactoring
disable colors for ci
bump version
remove run method from abstract class.
Move ExtensionTest.php to ExtensionTest.php.bak
Add doc string
Build package.xml at 2012-06-17
Add comment for runWrapper
Add basic controller test
Update lib/plugins/lsiimageplugin.js

Fixed bugs
Move line.py to tools.py
Add portfolio.py - cleaned up text for functions for putting in portfolio.
Play around with graphs, tree.
* send the good request to the server when switching or executing an exercise (switched -> switch)....
* simplified the result panel (no result by exercise)
* added the model to receive user data from the server, parse from json to UserData objects
* there are still bugs, but it's time to sleep...
Remove explicit UHD and FCD dependencies.
Explicitly link to libboost_system (req. with Boost 1.50).
Merge branch 'master' into stereo
Add: note openssl-vhost
checkpoint in a broken place :D
add textobj-indent to 'see also'
make = behave properly with indentexpr
developmentについてのドキュメントを追記
[bug #865909] process --version before running command
deprecate app cartridge alias
s/a error/an error
Merge pull request #180 from J5/bugfix2

Bugfix2 - a couple of minor bugfixes
Merge pull request #179 from J5/bugfix

Merged by openshift-bot
Automatic commit of package [rhc] release [0.99.7-1].
Looks like #179 needs specs to cover the added lines.
Merge pull request #182 from BanzaiMan/version_output_coverage

Merged by openshift-bot
Addresses US2853. Allows REST Client to negotiate with OpenShift
server which API version to use in order to communicate.

The list of preferred version on the client side can be an unsorted
list, and the client will pick the *last* one listed which is
supported by the server.
Tweak debug messages based on feedback.
These superfluous 'Accept' headers were throwing off specs on Linux.

(I suspect they were incompatible with the API version negotiation that
I introduced in US2853.)
Merge pull request #181 from BanzaiMan/dev/hasari/us2853

Merged by openshift-bot
Merge pull request #3 from dfm/master

Revamping the directory structure and Makefiles
Added DFM to contributors
More re-jiggering of directories, use standard GNU layout of src, bin, include
adding option for shared library
tonen worden nu weergegeven op grid, instrument toegevoegd
child comments
Add all standard library functions
[MOD] link to original initiator
Clean some nonsense questions from installer

* Autoselect Xen kernel
* Autoselect grub install method

by Vladimir Ipatov
Commented out MTU 9000 on the default interface

You can safe uncomment theese if you need it

by Vladimir Ipatov
Fixed dhclient.conf options tuning

by Vladimit Ipatov
Add explaining comment


git-svn-id: svn://svn.zope.org/repos/main@127249 62d5b8a3-27da-0310-9561-8e5933582275
Add test convenience helpers for interactions

This is the exact same idea as in zope.publisher, only we use a fake Participation
instead of a TestRequest, so it works with zope.security by itself.


git-svn-id: svn://svn.zope.org/repos/main@127250 62d5b8a3-27da-0310-9561-8e5933582275
Note forward-compatibility change for 'zope.component' 4.0.0.

git-svn-id: svn://svn.zope.org/repos/main@127251 62d5b8a3-27da-0310-9561-8e5933582275
Prep 4.0.0 release.

git-svn-id: svn://svn.zope.org/repos/main@127252 62d5b8a3-27da-0310-9561-8e5933582275
Tag 4.0.0 release.

git-svn-id: svn://svn.zope.org/repos/main@127253 62d5b8a3-27da-0310-9561-8e5933582275
svb

git-svn-id: svn://svn.zope.org/repos/main@127254 62d5b8a3-27da-0310-9561-8e5933582275
Note forward-compatibility change for 'zope.component' 4.0.0.

git-svn-id: svn://svn.zope.org/repos/main@127255 62d5b8a3-27da-0310-9561-8e5933582275
Prep 4.0.0 release.

git-svn-id: svn://svn.zope.org/repos/main@127256 62d5b8a3-27da-0310-9561-8e5933582275
Tag 4.0.0 release.

git-svn-id: svn://svn.zope.org/repos/main@127257 62d5b8a3-27da-0310-9561-8e5933582275
Packaging gltch.

git-svn-id: svn://svn.zope.org/repos/main@127258 62d5b8a3-27da-0310-9561-8e5933582275
svb

git-svn-id: svn://svn.zope.org/repos/main@127259 62d5b8a3-27da-0310-9561-8e5933582275
Note forward-compatibility change for 'zope.component' 4.0.0.

git-svn-id: svn://svn.zope.org/repos/main@127260 62d5b8a3-27da-0310-9561-8e5933582275
Prep 4.0.0 release.

git-svn-id: svn://svn.zope.org/repos/main@127261 62d5b8a3-27da-0310-9561-8e5933582275
Tag 4.0.0 release.

git-svn-id: svn://svn.zope.org/repos/main@127262 62d5b8a3-27da-0310-9561-8e5933582275
svb

git-svn-id: svn://svn.zope.org/repos/main@127263 62d5b8a3-27da-0310-9561-8e5933582275
Bump zope.component to 4.0.0.

Bump zope.authentication to 4.0.0.

Bump zope.browsermenu to 4.0.0.

Bump zope.browserpage to 4.0.0.

git-svn-id: svn://svn.zope.org/repos/main@127264 62d5b8a3-27da-0310-9561-8e5933582275
Added support for passing versions to set_worker_addrs.


git-svn-id: svn://svn.zope.org/repos/main@127265 62d5b8a3-27da-0310-9561-8e5933582275
Added some cleanup of test of passing versions.


git-svn-id: svn://svn.zope.org/repos/main@127266 62d5b8a3-27da-0310-9561-8e5933582275
Updated the lb pool to support splitting workers by version.


git-svn-id: svn://svn.zope.org/repos/main@127267 62d5b8a3-27da-0310-9561-8e5933582275
Register software version with ZooKeeper.


git-svn-id: svn://svn.zope.org/repos/main@127268 62d5b8a3-27da-0310-9561-8e5933582275
Don't forget to allow failures on pypy openssl
Working on AMQP connectors
Improved the dangling , for list of technical semianrs attended.
Added more docs for the rest of the main source files.
Add Example to SList.insertAfter documentation
Changed indentation in the count() function
update serverstats example to show that write errors can be ignored
add "Error handling best practices" section
Updated to query new collection
adding work on mac to the repo
conflict.php added
car number format in ticket
Add Ing::DefaultCommand module mixin for typical case

Incorporate it in publish_ssh and rake_pipeline examples

version bump
Merge pull request #17 from ethan77/master

paginate
Merge remote branch 'upstream/master'
bug fix
js util init
Add `Elm.` to `List`
Make changes to get `Dict` and `Set` working as expected.

Add a note to elm-server indicating that you don't need to restart to recompile code.
Update URL

- Download URL changed inside README file
smarter detection of javascript and css by WebAppServer html mode
add worker run every to config
Add statements
Merge branch 'master' of https://github.com/fkn/domic2
Add  添加几个 NetBeans 代码提示.
Changed StringAsset to EmptyAsset
Background weren't displayed in Opera
Added self assignment shared_ptr test
include Microsoft redistributable runtime libraries setup
First Japanese translation.
Merge pull request #77 from gjo/translation-ja

Japanese translation.
Merge branch 'master' of github.com:Pylons/deform
change note about japanese translations
Added translation of sequence_item "Remove" button
Merge pull request #78 from aleksandr-rakov/master

Added Rusian translation of sequence_item "Remove" button
note russian translation change
venue styled, calendar hover state added
change the followToken control to a button, restyled
ko.computed observables async
highlight followToken button when active
shape ops work in progress
add copyrights everywhere
start working on quadratic line segments (for quad intersection)

git-svn-id: http://skia.googlecode.com/svn/trunk@5286 2bbb7eff-a529-9590-31e7-b0007b416f81
Revert SkNO_RETURN_HINT fix in favor of a simpler fix



git-svn-id: http://skia.googlecode.com/svn/trunk@4529 2bbb7eff-a529-9590-31e7-b0007b416f81
renamed Response.rb
Remove unused variable in wp_update_themes(). props duck_. fixes #20831.

git-svn-id: http://core.svn.wordpress.org/trunk@21089 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Merge branch 'master' of git://github.com/WordPress/WordPress
change win size
README: add 'Backing up keyfile and password' section.
README: add 'Running from crontab' section.
refactoring some code as separate libraries with basic specs
display task hint only if # of taks are zero
Gracefully handle case where a RingServer already exists
added doc/sxivall.sh
Add mailing list pages
Adicionado cliente.h
auto upload Fri Dec 21 02:07:19 PST 2012
auto upload Sun Dec 30 18:34:55 PST 2012
auto upload Sun Jul 15 19:34:32 PDT 2012
Provide package directives for root namespace.

These are not required by Haxe, but we want to be consistent in that case, so
let's just add them.
Put both HTTP and HTTPS URLs into @include.

This seems to be varying either because they're in transition to HTTPS or some
other stuff, like different load balancers. Anyway, we're on the safe side when
we include matches for both protocols.
Bump version number to v0.2.7.
Merge tag 'v0.2.7' into stable
Merge branch 'stable'
更改link模型
修改article detail样式
Fix #2405 spawn on windows
added Alitheia-Core to SENSE software
WordPress
Fix tiny bug
Change spec. keyword selection, tweet judgement
Fix Wordpress::Xmlrpc.base_args
Fix symlinking, yet again
Merge pull request #100 from j23d/master

Added context and user as attributes to the view request for rendering slots.
New homepage
fix pyflakes warnings

(except for the ``__parent__`` property setter)
re-enable the pep8 plugin

the E301 & E302 warnings have been fixed in the meantime, one E124 warning is new.

with `pep8` at version 1.3.3 and `pytest-pep8` at 1.0.2 statistics are currently as follows:

  $ pep8 --repeat kotti/ | awk '{ print $2 }' | sort | uniq  -c
     4 E122
   188 E123
     1 E124
     6 E125
     7 E126
     4 E127
     7 E128
    12 E501
     1 E711
fix pep8 E124 ("closing bracket does not match visual indentation")
Cleanup DBSession calls
fix pep8 E122 ("continuation line missing indentation or outdented")
fix pep8 E127 ("continuation line over-indented for visual indent")
fix pep8 E125 ("continuation line does not distinguish itself from next logical line")
fix pep8 E126 ("continuation line over-indented for hanging indent")
fix a couple of pep8 E501 ("line too long")

the remaining 3 (in ``populate.py``) are too tedious, though...
Revert "fix pep8 E122 ("continuation line missing indentation or outdented")"

This reverts commit 4c87d82516aa525b9904e26302243eedd423df2c as Daniel doesn't like it (see https://github.com/Pylons/Kotti/pull/103#commitcomment-1582959).
Merge pull request #103 from pyfidelity/pep8

re-enable pep8 plugin and fix some warnings
Merge branch 'master' of github.com:Pylons/Kotti
Add two more methods.
Merge pull request #102 from teixas/DBSession-calls-cleanup

Cleanup DBSession calls
Enable deferred loading on File.data column.
Merge pull request #105 from chrneumann/deferred

Enable deferred loading on File.data column.
Merge branch 'master' of github.com:Pylons/Kotti
Fix silly pep8 sillyness.
upgrade require.js version to 2.0.6
Fixing an issue where the tabzilla would glitch on slide down Issue #37
Removing css that is causing an issue with tabzilla sliding down. Issue #37
Merge pull request #39 from caseybecking/master

Fixing Issue #37
Arregle problema con paginación de historial
remove dated text
0.3.1
better support for figuring out protocol
bump, require node >= 0.6.15
Add FF_INPUT_BUFFER_PADDING_SIZE to extradata allocation
Fix some PL translations
Merge remote-tracking branch 'origin/master'
convenience category on date formatter
Merge branch 'master' of github.com:jmoody/LJS
"`git instaweb --serve`" project
Merge remote-tracking branch 'origin'

* origin:
  fix formatting
Change link to hgbook in "`git instaweb --serve`", removing the hash (anchor) part, as it confuses markdown
Merge branch 'master' of git://github.com/peff/git.wiki into gsoc2012-wiki

* 'master' of git://github.com/peff/git.wiki:
  Change link to hgbook in "`git instaweb --serve`", removing the hash (anchor) part, as it confuses markdown
  "`git instaweb --serve`" project

Conflicts:
	SoC-2012-Ideas.md (fixed to 'master' version)
"Graphical diff in git-gui" project
Remove expansion config
more graphics capture tweaks and optimizations
full wypas
Version updates and install distribute/pip/sphinx.
Add a tmux configuration.
Update versions.
Merge branch 'master' of github.com:jwp/config
Set up python compiles on pleiades.
get rid of the non-touchable version of the message list items. (The real difference was the capability to show previews)
some more auto detected attachments
Modify Parser and Scanner to add new Types
added closure support to or method
typo fix
Implement Gaussian::Primitive#overlap
Additional specs for Gaussian::Primitive
making swtcreate option usable
new python package
Add -pie-track-active:false flag to prevent toggling the active class name on mousedown/up on a case by case basis. This can be used to avoid the IE6-7 bug where you couldn't drag the scrollbar of a descendant. Fixes issue #190.
Merge branch 'master' of github.com:lojjic/PIE
sistemazione ok
add doc
Merge branch 'master' of github.com:ltj/rentit
guarding code added to all webservice calls
Merge branch 'master' of github.com:ltj/rentit

Conflicts:
	RentIt/ClientApp/UserRegistration.cs
corrected for use w RentItUserControl inheritance
updated appendix. next to do is baseline for 2nd tier, then baseline for 1st tier
how sia
misc

Signed-off-by: Rouchel Yan <rouchel.yan@maxwit.com>
misc

Signed-off-by: Rouchel Yan <rouchel.yan@maxwit.com>
print statements in elevator
Merge branch 'master' of https://github.com/mcm46/lab2.git

Conflicts:
	bin/people/Person.class
attempts to fix broker->spawn()
Merge branch 'master' of github.com:mdogo/core

* 'master' of github.com:mdogo/core:
  cleans up db model
can now have seperate value and displays for each key
added mathjax and extra behaviors for keys on press
wups forgot the error if you don't define a behavior
added textareas
updated for better use with codemirror
cleaning up and makeing everything a bit more modular
Merge remote-tracking branch 'origin/master'

Conflicts:
	keys.js
fixes for finding text areas, inputs etc.
Merge pull request #3 from whytheplatypus/master

mathjax!
Changed colorsheme from badwolf to solarized.
add receiver in member
commented facebook link
OPDIS : Fixed type errors in test programs
OPDIS : Fixed autoconf build to work on OS X (w HomeBrew)
Added more MimeTypes
Lift Boot Bouncer + http/js package (JsCommandsPlus)
Modified Bouncer in accordance with Lifts ajaxPath/cometPath depth rules (<=1)
Func*AttrBindParams, flatXML bind helper
FuncFormatAttrBindParams
StaticScripts v2.0, now with overridable defaultVersions and formatting functions
Moved IORC to PGScala project.
Renamed StaticScripts to StaticJS, added StaticCSS.
added io Runner
chmod +x .sh helper scripts
changed Runner package and util version, published to local nexus
Merge pull request #1 from denibertovic/master

added Runner to etb utils
Cleanup.
added TrustedHttps to etb util
Merge github.com:melezov/etb
increase etb-util version, publish to nexus
Merge pull request #2 from denibertovic/master

added trustedhttps
Google Analytics snippet. StaticJS relative path tweak.
Added support for scala 2.9.1-1
Merge branch 'master' of github.com:melezov/etb
made '2do config' work. It can read values from the parsed config file
moved config file specification to default-config.h
the list command supports now markdown tables
moved config_command function to src/config-command.c
added todo_filename parameter for comand line, only directives which contain characters [a-z_] are matched, renamed constants improved string setting function for directives
Update bookmarks/appinfo/migrate.php
initial version for feedback
first crack at multiple JSON response codes
response code for already registered
development env warnings
Merge branch 'master' into response_codes
various response codes for errors
response messages for delete action
Remove staging details from config/database.yml
Fix test name conflict
Merge branch 'staging_notification'
Merge branch 'response_codes'
updated WTSI strain
Merge remote-tracking branch 'origin/master' into status_email_extras
Fix the divide by zero in matplotlib's PCA, make compression result cleaner
Add response module
Load response module
Cut the crap, use List
temp
Merge branch 'master' into nighca
temp
temp
Merge branch 'master' into nighca
temp save
temp save
save to test
Merge branch 'master' into nighca
temp
Merge branch 'master' into nighca
debug version
Merge pull request #6 from nighca/nighca

Nighca
add next to struct YYSTYPE
model builout
Ignore -N option if accurate file layout is specified

This patch ignores any archive name, (specified with the -N
command line option) if the 'accurate' file layout is in
use.

Previously, if the accurate file layout was used in conjuction
with the -N option, rotter would not include the expected
minutes, seconds and hundredths of a second filename parts:

$ ./rotter -L accurate -N archive /tmp
[INFO]   Sun Jul  1 19:20:27 2012  JACK client registered as 'rotter'.
[INFO]   Sun Jul  1 19:20:27 2012  Opening new archive file for ringbuffer A: /tmp/2012-07-01/archive-2012-07-01-19.aiff

$ ./rotter -L accurate  /tmp
[INFO]   Sun Jul  1 19:20:50 2012  JACK client registered as 'rotter'.
[INFO]   Sun Jul  1 19:20:50 2012  Opening new archive file for ringbuffer A: /tmp/2012-07-01/2012-07-01-19-20-50-32.aiff

This patch fixes this inconsistent and undocumented behaviour.
Merge branch 'master' of github.com:njh/rotter
Issue #244 Added scatter with regression lines model
Added scatterPlusLine model to Makefile and minifying
Implementada a visualização dos graos tipo imagem #154
removendo abnt-format
refatorando o "ability"
Added details of frequencies in categorical summary.
replaced brandnames
brandnames in head
created validation webservice
Update buildfile

Edit version number to indicate 1.1.0
Execute Event.echo in frozen time

Hooked functions on Events now execute in frozen time again so sample,
filter and join are correct (possibility of different occurrence times
than sources).

This does expose the framework too time lags during the occur action.
This should be fine as long as the user doesn't pass anything too
intense to sample/filter (join should be fine).
Added basic logging & (prematurely) added Windsor wraps.
Added Checkin and Checkout Web Service calls.
Wired in Windsor to allow console to create ELM object.
Renamed Test SharepointService
Made the log4net outputs a little easier on the eye.
Added ISOAPService interface to allow installation by convention.
Added Moq framework and started using that to stub out dependencies.
using rbconfig in extconf.rb
add a maven it test
Some random messing about
Add dataset method
Remove cruft. Simplify data.
Show SVG::Graph::VERSION
+diag(sprintf 'Testing SVG::Graph::Kit %s, Perl %s, %s with SVG::Graph version %s',
+    $SVG::Graph::Kit::VERSION, $], $^X, $SVG::Graph::VERSION
+);
Simplify ok msg. Fix __END__ code (even though it's not used atm.
Simplify _setup()
Correct example/test data. Remove cruft.
Fix example code again. Grr! :)
Collapse synopis TODO
Fix syntax errors.
Remove unneeded eval test.
Isolate handling axis.
Testing in progress...
Change attribute type to plot.
Comment code paragraphs.
Draw the axis unless it's=0.
Handle user axis input and default.
Fix hash key naming.
Integrated gevent-profiler
Tests for profiler util
id main
First version

next track, selected class, pause don't working
Improved styling for phones by not wrapping long conf/person names and removing some unnecessary words.
Moved ReadQueue to factory/service unreadQueueFactory and renamed to UnreadQueue.
Removed readQueueService and started using readMarkings/unreadQueueFactory directly from ReaderCtrl.
Capitalized some words on texts.
fix #43, вынес newAction
delete manifest for testing
fix fatal error

2 funktionen, derselbe name..

Signed-off-by: GabrielWanzek <gabrielwanzek@ymail.com>
r198: changed the BCF2 magic to BCF\2\1

As "PASS" is the first keyword in BCF2, backward compatibility is broken. Mark
D suggested adding \2\1 to distinguish from older versions.
r199: support retrieving reads w/o coordinates
Merge remote branch 'main/master'
Установить плагин altercation/vim-colors-solarized

А также сменить цветовую схему на solarized (темный вариант).
Some simple gender-neutralising changes.
Continuing copy edit (K-L).
rpclib.test.test_service: add logging to test_thread_aux_wsgi.
have wsgi request for ProtocolBase.REQUEST message explicitly.
server.wsgi: support StringIO as 'wsgi.input' value
protocol.xml: fix error serializer.
application: add overridable initialize method. you should be able to call this multiple times.
aux: AuxMethod.process it's now a bound method. (was static)
setup/dirs: fix for failure to find embedding executable
scribble: decode a lone ` as a left "curly quote"

Also, add 'lsquo as allowed content.

Omitting the ` conversion in the first place was over-conservative.
There's a backward-compatibility issue with this addition (i.e., a
document might contain a backquote in a decoded context that is
meant to be rendered as a backquote), but the potential problems
seem minor.
compiler/cm: fix self-dependency check for ".ss" vs. ".rkt"
change `stream-append' to use its last argument as the result tail

Closes PR 13130
doc fix

Closes PR 13105
remove a bunch of unnecessary fields (define => define/private
and lift out some pens and brushes to the module top-level)
fix debugger for the case when it decides not to annotate a file

related to PR 12937

This doesn't seem to fix the PR since the debugger is currently ignoring
the TR programs (not annotating them) but at least it does not crash now

Please merge to 5.3
adjust a bunch of error printfs in raco setup so they include the
stacktrace (by calling error-display-handler). Not sure if this is
always safe, so including it in a separate commit for easy reversion.
strengthen contract on blockss field of table struct in scribble
Initial commit
Merge github.com:pockata/x3
Updated styles and fixed shiv bug.
SC#QCADOOMES-830
SC#QCADOOMES-830
Merge branch 'master' of github.com:qcadoo/mes
修正bug

修正客户端与服务器间的重大bug
redefined measuring
UCBG-35: Propagation activity group auto-increments order field and sorts by order when new activity group is added.
UCBG-107: Fix CBD Restriction checkbox tied to cultivated field.
Merge remote-tracking branch 'cspace-deployment/botgarden_2.4' into botgarden_2.4
poor man drop/migrate/sample data attached to the main function when you lein run at least you get something
jout d'un mask
update
move dots in .vim :cat::dog:
onCommand() is removed. The command handler shall invoke render() explicitly
vignette version 1 final
Changes in Statement. Work on Cell.
Added build dir to ignore file
Updated to new version of cutadapt.
Varios jugadores pueden guardar y ver sus boletas
patch1

Conflicts:

	db/src/main/resources/changesets/changelog-Release_I.xml
patch2
patch3
patch4
patch5
patch6
patch7
patch8
Merge branch 'master' into hugo_mifos_acc

Conflicts:
	application/src/test/java/org/mifos/security/rolesandpermission/RoleTestUtil.java
	db/src/main/resources/changesets/changelog-Release_I.xml
MIFOS-5583: Fixed the negative balance when penalty or fee was waived
MIFOS-5702: Add the ability to import receipt numbers above 9 digits
MIFOS-5702: Improved the speed of the import
MIFOS-5704: Fixed changing prefered language to English while other language is set as default in config file.
Merge pull request #100 from jpodeszwik/MIFOS-5704

MIFOS-5704: Fixed changing prefered language to English while other lang...
MIFOS-5763: Fixed editing number of installments and disbursement date on GLIM accounts Disbursement Dates for member accounts in GLIM and fixed existing member accounts.
Merge pull request #101 from jpodeszwik/MIFOS-5763

MIFOS-5763: Fixed editing number of installments and disbursement date o...
MIFOS-5727: Fixed problem with local jetty and changed place ETL plugin and Job
MIFOS-5702: Added ability to undo import
MIFOS-5724: change message when mifosdw database is not configured
MIFOS-5702: Added 'not supported' status for MPESA imports
update worker dependencies
use only jshint in javascript worker
add options for cssLint
fix tests
do not show gutter tooltip while selecting
small cleanup
reduce flickering of annotations while editing
fix csslint
update jshint
do not group annotations by rows since whole array is replaced every time
Make updates to theme parser logic and tool
regenerate all themes
remove redundant rules from themes
Update themes some more
add indent guides for ambiance and xcode
fix active line color for solarized_dark theme
New site
Merge pull request #965 from c9developer/master

New site
Added sharejs
Merge pull request #966 from c9developer/master

ShareJS
optimized function showSticker
fixed a bug where `.=` declares LHS
wciaz scope
ISA support in reduction.
1. changed session-key-filename from ~/.lastfm-stats-sk to ~/.api.lastfm
2. fixed the authorization error with getting session key
3. other small fixes
added vk.py
gah, clean state before run
make it easier to torture test the fork stuff
added cas #s for ascrs and oscrs
fixed bug in list_accept_choices in Cfg
fixed OptionParser FAM race condition
fixed docs for packages.conf/rules.conf
added docs for selectively disabling Cfg validation
Store group="name" rather than gid="GID" at the attribute of UnixUser.
This fixes the wrong behavior of creating the usergroup data.
Thanks emias for helping me out this problem.
version 05.09.2012 17:10
use more var. to make it more flexible
Clean up a lot of code.  Still broken.
Change to memberVar_ naming convention.
Relay and log death messages
More completion options
Rename app_authorizations tent_expires_at column to expires_at
[RS] 9.1 und 9.3
[RS] 9.1 und 9.3 complete
ruby 1.8.7 however does not like the :word: character class. thus, use :alnum:
Text in EditBox should only be cropped when the text limit is set to true
Add a way to create a null value.

Signed-off-by: Thiago Farina <tfarina@chromium.org>
Some ideas on concepts
Configuration specs
Add specs for base module
Refactoring
Split lord into multiple files
Specs for Lord::Base
ThinServer library with start task
Refactor config
Start, stop, restart tasks for thin
Version bump to 0.2.0
Regenerate gemspec for version 0.2.0
Add a separated test demonstrating partial and comp functions
Fix loadECFiles so nobottom works
Moving on!
additions
rationale
Supports rendering of a string
Supports rendering of a string
Handle string templates better
Baseline import of lwip-1.4.0
Added .DS_Store to the ignore pile
Bare skeleton to make lwip compile inside of the lk tree.  Doesn't work, just builds.
Naming of exceptions improved - fixed.
Update Service::open according to new IFileContainer.
new file:   401.c
opti css token, css selector token, fix css beautify with @keyframes in @media
Added TODO file, added links to footer, restructured some markup
modified:   chat_svr/rebar.config
	modified:   conn_svr/rebar.config
Adding cep.artifact.feature

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@141518 a5903396-d722-0410-b921-86c7d4935375
Commiting the patch from IsuruR for TOOLS-1145. Thanks for the contribution

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@137935 a5903396-d722-0410-b921-86c7d4935375
Services and site addition
Added compilation capabilities for C and Java
Not save photo in local if a user select it from photo album
Temporarily disable mathjax extension
add shortcut for %
separated general Google Maps Extension.
FIX: navbar ie
updated RQL to properly strip the API-key
Renamed the goa file.
delete not found submodule zsh/function-871500.git
update submodules.
started using github for windows

Time to pick up on the project and get these streamign tweets working.
Among other stuff. Been a while..
Merge remote-tracking branch 'upstream/master'
Small changes

Picking up on working on o3o again, made some changes to the tweetstack,
gonna work towards a single client that supports multiple users.
Merge pull request #9 from xarinatan/master

Small stuffs for multiuser support
Added "added by field" and notifications to that email for game creation and rickrolling;
drop url= from generated urls

no longer need this after the last commit
dont assume /camel as install path
remove global url var from auth.html
auth: pass around server obj instead of url
fixing daily view datepicker
Merge branch 'feature_lending_improvements_2' of github.com:zhdk/leihs into feature_lending_improvements_2
availability overbooking summary template (to be styled)
tuning partitions
reverted to_s in MetaDatum class itself
misc fix
* remove unnecessary AU
* change type operation agent of CKEditor
add typing operation
* register typing agent
* add typing operation test case
* modify and refine pom.xml of all projects
* merge type and typing operation agents
* modify type and typing test cases
#1 Allow to set the context path.
Merge commit '#1 Allow to set the context path.' into dev
* add max. and min. event data builders
* add max. and min. operation
* add max. and min. test case
* close #10 maximize & minimize operation
Merge remote-tracking branch 'origin/dev' into dev
#10: refine max. and min. operation test case
add drag & drop operation for #8
#15 Mouse over & out feature and test case

use ClickAgent's test case, click-all.zul, for test.
#22 add special type agent implementation for Colorbox and test case
#9 selection (highlight) operation in TypeAgent

add select(int start, int end)
add interfaces of operation
fixed the method name of size agent.
change interface spec. of operation agents
#11 progress commit
Change PagingAgent method name.

Revise DragAgent's javadoc.
fix typo.
Map icon fix
Merge branch 'master' of github.com:zpasal/ssg

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/common.js
control/if?, control/for
splash screen wait for longer time added
#8: fix click-editor onblur
(cherry-picked from 43b983e)
Modified White/B, basically as a shit test for something.
Setting up infrastructure for Modifiers
Added recursive move modification
This doesn't work yet
Urgh
Merge branch 'alpha' into recursivemoves
Merge branch 'alpha' into recursivemoves
Merge branch 'alpha' into recursivemoves

Conflicts:
	src/engine/action.cc
Merge branch 'alpha' into recursivemoves
Merge branch 'alpha' into recursivemoves
Fixed recursive moves, vertical static displacement.
Merge branch 'recursivemoves' into alpha
Fixed riposte
Merge branch 'alpha' into alpha-teal
This is no longer necessary
Setting some stuff up
Setting up some stuff
Silly warning
bluh?
Merge branch 'alpha' into alpha-black
ARGH
Improve wording and order of readme
Levels load properly
bcfg2-lint: fixed errors in TemplateHelper lint plugin
set up bcfg2-info logging just like bcfg2-admin
fixed deletion link of group members
Fix database conversion for custom added spells to the unitframe filters, wasn't working as intended.
Version 3.74
Russian locales
classtimer font should now be adjusted with the general font settings
Add a "Show Auras" button to all unitframes.
Change a default value
Tweaking settings on a force shown arena/boss frame would cause the frame to re-hide.
change more default values
Merge commit '1780a51c39cf045c4d0e064817af2817f0e561fd'
Use Cilex Pimple Service Provider.
Point to new location and fix structure
European championships: Example update (Italy: Round 10).
Merge pull request #5 from hwg125/gh-pages

European championships: Example update Italy 02.10.12
Imporoved bundle.
Added a java Swing GUI that will serve as the base for CSC 448 Students to
use for creating programs that the BIO/CHEM 441 students are able to use.
bogus removed

Signed-off-by: mathi azhagan <er.mathi@gmail.com>
step 4 changes changed successfully
Signed-off-by: mathi azhagan <er.mathi@gmail.com>
boucher banco
asd
Merge branch 'devel' of https://github.com/FraGoTe/OES into devel
Initialize cache for migrations
card_controller fixups from comments
Volume lists update
Initial commits; dotfiles from my dev vm at Netcraft.
Throwing in the towel.

Pretty sure I over thought this one. Can't get it it stop at the right
place, won't decrement the counter correctly. Among other things. I
will continue to work on it.
some consistency changes
Fix compile and add phpinfo

Useless info

useless header
Merge pull request #9 from stealth35/master

Fix compile
BUG #13659. Fix segfault in vtkPMaskPoints.

Cleaning up the logic in contructor/destructor that lead to invalid reference
count updates in certain cases.

Change-Id: If149d6aecac8ca5142ceedd3294c3162ca62af35
Merge topic '13659_fix_pmaskpoints' into master

23e12c3b BUG #13659. Fix segfault in vtkPMaskPoints.
Fix build errors on Linux; #include <typeinfo>.

Change-Id: I841b8f3d5faf08bc6f355851728d4cba6e229310
Merge topic 'fix-linux-typeinfo-include' into master

e0c531bd Fix build errors on Linux; #include <typeinfo>.
A fix to prevent a R/T error when used with composite pipeline

NB: The error is caused by the WHOLE_EXTENT information not being
defined for structured grids in the composite case.

Change-Id: I870edbda0d87332e2dfc18b1836a4c15ed9c0653
Merge topic 'FixStructuredGridGeometryForCompositePipeline' into master

cf5508df A fix to prevent a R/T error when used with composite pipeline