labofsahil/github-event-dataset-2012 huggingface dataset:
ll-merge: warn about inability to merge binary files only when we can't

When a path being merged is auto detected to be a binary file, we
warned "Cannot merge binary files" before switching to activate the
binary ll-merge driver.  When we are merging with the -Xours/theirs
option, however, we know what the "clean" merge result is, and the
warning is inappropriate.

In addition, when the path is explicitly marked as a binary file,
this warning was not issued, even though without -Xours/theirs, we
cannot cleanly automerge such a path, which was inconsistent.

Move the warning code from ll_xdl_merge() to ll_binary_merge(), and
issue the message only when we cannot cleanly automerge.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clean up after last commit.
Bundle resources.
Forget to change the LICENSE.txt into GPL.txt in the README.md

Signed-off-by: Nils Hasenbanck <nils@hasenbanck.de>
supported foreach stmt
Return "true" as the value of "created" flag of domain statuses permanently
Return "PendingDeletion" as a part of index field status
Return "RequiresIndexDocuments" as the state of newly created index fields
Fix status code from DefineIndexField with conflicted options
Fix status code of "resource not found" error
Update tests to validate on creation
Use validate() instead of createSync() to run tests without database
validate() returns itself
Don't create index field without type
Fix tests for index fields from database
Update tests based on the latest responses (compatible to the ACS)
Update test for configuration of index fields via the gcs-command tool
travis-casper: reorder commands to fail first
travis-casper: put symlink on /usr/local/bin
doc => docs #36
Test für issues refs #1
Start up a new server for each client that connects.
sourceid
Add a TOC, polish the file an issue section.
fixing env bashrc append
[Build] Comment out lint
Removed populate script
Site updated at 2012-08-09 13:40:05 UTC
Implementace chyby z projektu LinphoneManager: Fix GSM handle issue with iOS6
Update to ACPICA 20121018.

    This is an update from 20120711 and A LOT has happened since then. See
    https://acpica.org/download/changes.txt for all the changes.
Screen: fixed a warning and gcc2 build.
Draw rounded inner corners for return key in Keymap.

Draw the return key with rounded inner corners instead of square, this
builds on top of the changes made in hrev44709. The secret to rounding
the corners was to draw both the edge and background of the individual
sections before drawing the button's background on top minus the
clipped out bottom left section.

+alpha4 (optionally, purely cosmetic but shouldn't hurt)
Declare syscall_numbers.h include for x86_signals_asm.S

Fixes #8718 (again).
bunuses burn all around
GameObjects were added to ServerGameModel
vim: python folding with indentation
Fix defaultTextFormat not applied when text is not set.
Demo:
	//Bug: The text typed into the text field stays black even if the defaultTextFormat is red.

	var textformat = new TextFormat();
	textformat.font = Assets.getFont("assets/SourceSansPro-Regular.ttf").fontName;
	textformat.color = 0xFF0000;

	textfield = new TextField();
	textfield.defaultTextFormat = textformat;
	textfield.type = TextFieldType.INPUT;
	//textfield.text = ""; //This is a workaround.
	addChild(textfield);

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2100 1509560c-5e2a-0410-865c-31c25e1cfdef
Added Niel's ByteArray unit test methods

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2101 1509560c-5e2a-0410-865c-31c25e1cfdef
Fix for IE9: Revert "[html5] Small optimisations to hot code."

This reverts commit d3c11d98848c9c7ec20dbf219d8cafd815bf9921.

Conflicts:

	jeash/display/DisplayObject.hx
	jeash/geom/Matrix.hx

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2102 1509560c-5e2a-0410-865c-31c25e1cfdef
Addendum to the last commit.

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2103 1509560c-5e2a-0410-865c-31c25e1cfdef
Update scrollbar on toolbox changes in /comb (ugly way)
add script for bin
Bug: 11303 Fix variable name.
This seems to be required for some RDBMS when migrating.

When migrating from a previous column definition, and no default is
given for the current definiation, the previous definition's default
is used. Must override that with a valid default for the current
column type.

Bug: 11877
db reset fix in production
optional uuid-path arg for update/delete-node/leaf
Increased wait-for timeout to 750ms for FF plust read-leafs
country-school assignment through country_list + delegate dob year range changed
B&B, greedy with heuristics
use RootController.
Improved demo with CodeMirror support, added link to the live demo to README
Updated readme to get colors for code examples
upgrade query to 1.8.2
enhanced onebox search

now includes definitions (if there are any) and public uris.
quicksearch and onebox don't need to share extract_concepts anymore,
removed it.
metatags
Merge branch 'master' of github.com:itkin/squid
added user_module_invoke to shib auth login
watchdog on bakery_user_login
fix bug with displaying error message on asset load
BUG: Bump ITKv3 version.

Add patch that fixes GCC 4.7 -O3 test failures.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21464 3bd1e089-480b-0410-8dfb-8563597acbee
Add executable script to /bin; update package.json
bump version just cause
Fix bogus sig causing a "Set-Cookie" with "myCookie.sig.sig"
Fix tests: unsigned cookie was actually getting signed
Add opts.overwrite to clear out previously set cookies of the same name

This requires that the cookie header array is filtered when this flag is set. Since connect/express have custom handling for setHeader('Set-Cookie'), we need to bypass that to be able to fully control which cookies get written to the response. Hence the crazy prototype setup, to find a "working" setHeader without connect/express magic.

Caveat: Currently overwrites all cookies with the same name, regardless of path or domain. This is why I didn't make this global behaviour, so now the default is to behave as previously, but give the user the option to clear out any duplicates out of the request.

Reasoning for the whole commit: we can have a situation where one of our signed authentication cookies is corrupt (e.g. bad sig) but it's "parent" cookie is OK so we can regenerate the corrupt cookie by checking the parent cookie with a SSO-service. In this case, the cookies.get('child') tries to clear the 'child.sig'-cookie, with a 'Set-Cookie' with an empty value. Later, the SSO-check rewrites a correct 'child' cookie with it's sig. Without the overwrite flag, the .sig cookie gets duplicated into the 'Set-Cookie' header.
Figured out a less hackish way to point to the unpatched setHeader function
Merge pull request #19 from mtkopone/fix-bogus-sig-and-set-cookie-overrides

Fix bogus sig problem add overwrite-flag
core.py: fix app.source_index args
added a real button, a new aside on the right and added some css
got rid of the prompt; added buttons for the two game modes. used some newly coded functions to make mousemove more concise
added buttons for the two game modes
added the cellWithGravityY function to help with drawing the X's and O's in Connect 4 mode
added getCellXCoordinate and getCellYCoordinate functions to make code neater in both View.js and Controller.js
Fixed consistency issue
Began working on client detail viewer
Fixed bug in escHTML when it was given a non-string argument
Fixed style problems with div.blackoverlay and table.layouter
Fixed problem with maximizing animation
Removed console logging
Finished implementing client detail viewer
No more underscores in function names
Fixed confusion on readme param
Fixed typo; removed next/stop
Removed next/stop from possible JSON video data file commands
Began implementing channel manager
Added configuration for socket.io and fixed NODE_ENV check for mu
Fixed some keyboard shortcut problems
Fixed text wrap issue
Fixed issues with keyboard shortcuts; added support for media keys
Fixed bug due to new keyboard code
Added another example
Updated error messages and clarified param test
Making sure input placeholders are grey
new function: isMultitouch
Modified a few scripts for bug benchmark tests.
Import GDM code from Brest

gdmfuncs.1.1.R and gdmlib.dll are from Ferrier et al, given to Sophie by J Elith. They were downloadable form a website which is now down.

lib_gdm.R is Sophie's wrapper do.gdm function. It should still be called from a script which is not included here. Ideally this function will be re-written to take advantage of the new environmental database handling functions.
FIX: Obtiene los Items de Quote y no de Invoice
Merge branch 'master' into dev
gui: colors for dbg too
dbg: add #dasm alias for disassembler
dasm: better fix for code_binding: never return Indirection in backtrace() if it is solved
Array of fn pointers and infinitely loop animations
Measures time and displays results, added Insertion Sort
Selection sort, more pivots, more time stuff
minor
modified readme. was unsuccessful with install_github so removed that
suggestion
Fixing vim/plugin/search.vim symlink.
added a skeleton appendix for the chronological ordering of the project
Graphics for radial lights.
Start working on the map, fixing intermittent Fathom bugs, woops.
Load map correctly.
More work on sprites. Holy crap so pretty.
Lots of package migration
Lots of package migration
slimming pages
code level UI introspection
Fixed libs ref
SeatOverview
Fixed another unicode issue

- Removed u'' before unicode literals.
- Removed encode() before call to addstr().
Lengthened read timeout to 25 sec, and set retry count to 2, for Cisco IOS commands.  This addresses an issue where commands that time-out are retried, but the router hangs up the session after the original command is killed before they can start.
End-of-life for disco.sh/bat utility.
More descriptive return object logging.
doc: update 'Fork me at Github' ribbon

Replace 'Fork me at Github' ribbon with a new one fitting the website's color
scheme.
benchmark: add single process tls connection benchmark
doc: fix bug in child_process.spawn() sample code
domain: Fix stack leak on error
Merge remote-tracking branch 'ry/v0.8'
dns: remove unused functions
Correct outputs list in "node_etw" gyp target.

The gyp target node_etw didn't list its output dependencies. This
was causing virgin builds to fail with a "failed to open file for
write" error.

With this corrected outputs list, gyp reliably pre-creates
required output directories.
Added CMake build rules and FindGLEW script.
Merge pull request #1 from joinge/master

CMake scripts
Force align DMAs
Fix regression involving negative-x sprites
Add pausing
Don't redraw layers when there are window y issues
Fix IntrWait
Dismiss the IRQs we have disabled
VCOUNT IRQ on 0 works now
Update LoadService to use get_path
Last of to_path ad-hocs moved to get_path
rename StringBuilder.toStringAndRelease to toStringAndClose
Apply pep8 to _basinhopping.py
cumsum() fixed for matrices
Merge remote-tracking branch 'upstream/master' into cumsum
Merge remote-tracking branch 'upstream/master' into cumsum
fn.cumsum fixed, updated the jStat.fn extension code
separate instance method generator for cumsum()
instance method for cumsum cleaned up
deleting general function statements
Merge pull request #58 from tushargupta51/cumsum

cumsum() fixed for matrices
Added classes
Changes
Course updated
[rackspace|compute] Improve attachment test reliability.
Created gh-pages branch via GitHub
first page
update index
update index
Merge branch 'master' into gh-pages
update css
implement edit idea,rewrite idea detail page and user detail page,filter ideas list through topic,idea status,user,tag and search,restrict user avatar size and format
delete activity model,delete unused views about users,ideas
image chenges
Proof of concept implementation of fillRule canvas property
Merge branch 'upstream' into HEAD
Merge https://github.com/jwal/webkit
Updated files so that they are licensed under GNU LGPL.  Included lgpl.txt.
Needed to add units.cpp
corrections to wbp exersise 8's css.
Added readme
Changed readme to html
pod tweeks; bump version
Merge pull request #96 from kazupon/doc

Doc: (WIP) Add some markdown API document files;
process: fix -Wall build-bug @kazupon;
Merge branch 'kristopher_dev'
main: clean-up to mode -e and -v; removes mode -i;
Merge branch 'kristopher_dev'
Doc: update 'utils' documentation; Utils: reafactored;
better add_hook deprecation warning
added a few more real-time web recipes
improved real-time web recipes some more
refined real-time web recipes
added another real-time web recipe
added another timer example
better delay examples
added delay recipe to cookbook
removed experimental status from Mojo::IOLoop::Delay and removed defer method from Mojo::IOLoop
added experimental url_with method to Mojolicious::Controller
fixed url_with to be compatible with url_for
removed url_with method and upgraded url_with helper
refer to url_with from url_for documentation
fixed Mojo::Command->app to be an attribute and not a method
added skeleton for new development mode not_found page
removed some more legacy code
added list of routes to not_found template
be more generous with table spacing
made not_found page a little easier on the eyes
updated welcome message in lite_app skeleton
Distribute COPYING.iOS file
Update benchmark results in README.md
changed its nick name
Twilio integration
Pass original caller id on the 2nd leg
ClientSide complete
Added additional error handling in chunking.
fix the planet theme
Mesh

Nějaká ta malá změna ohledně odkazování na objekty.
Improvements in plugins
Agregando apertura de la etiqueta <header> se cerraba pero no se abria.

Cambie la idioma del documento por español Mexicano asi sera mas fácil
si un buscador desea traducir la página ya que conoce la lengua de origen.
Me quede con la duda del por que se esta ocupando el esquema de ¿organización
en todo el documento? (<html itemscope itemtype="http://schema.org/Organization" ..> )
fix not to read webhdfs/fileutils by encoding problem
Added more methods to prototype
change to fork of vim-coffee-script w/ iced support
urf-input: Remove the unnecessary device match rules
mejorada la forma en que se construyen los encabezados
Fix DEBUG compilation error with double declaration of a timer.
CHANGES updates
APIchanges: fill in missing dates and hashes.
APIchanges: mark the place where 0.8 was cut.
APIchanges: mark the place where 0.7 was cut.
Регистронезависимый логин.
add test
fix bugs
update
update
some changes: add excel function, assign for all
Update scripts/mappers.js
remove stray index.js
Unit Tests for Carousel
Unit Tests for Carousel
Unit Tests for Carousel
Merge pull request #236 from Iheartweb/master

Unit Tests for Carousel and an addtion for List tests.
Feature: added support for electro-l n1 HRIT data.
automatically connect using IPv6 or IPv4

A failed server will cause the next group of hosts in
an address family to be used, until there are no more
groups of hosts and it starts again from the beginning.

The list of hosts within a group of the same address
family is randomly shuffled so that a different IP is
used if the resolver library returns the IPs in the
same order each time.

Under Cygwin a pool of sockets is used when making
connection attempts, otherwise the child process passes
the socket to the parent when connected.

The connect API is changed:
  Removed parameter "sock"
  Added parameter "retry"
  Added callback value "sock"
added the ability to hide the chat and the time needed to correctly guess the song is now displayed for the three fastest players
muh blub
Changed labels

Adjusted labels to state the actual meaning of the number
add python one-liner solution.
31/10 - Pokedex adicionada
adding content of drupal tour
probable fix to fix
Make parameter set manager methods polymorphic.
rename membership to servicegroup
rename membership to servicegroup
updated: Greek translations for core strings
updated: Greek translations for core strings
updated: Japanese translation for core and Confluence strings (thanks to kohji405mi16)
updated: Portuguese (Brazil) translation for Confluence strings (closes #12834 and  #12833 - thanks Wanilton)
updated: Greek translations for Confluence strings
updated: Greek translation for Confluence strings
updated: minor changes to Japanese translation for core and Confluence strings (thanks to kohji405mi16)
fixed: undefined symbols in MythTV PVR client

The MythTV PVR client uses functionality from libmythxml.a but does not
link it in. Additionally, it fails to implement several PVR channel
functions, and has a wrong name for GetChannelsAmount(). Also, it is
linked against libdl which it doesn't use.

To fix the undefined symbols, make the client link against libmythxml.a,
add stubs for the missing functions, and change GetNumChannels() to
GetChannelsAmount(). Also drop unused -ldl from the linking command
line.
Create missing thumbnail for recording.
pvr: moved some of the persistance logical from CPVRChannel to CPVRDatabase
pvr: optimisation for the initial channel import on sqlite3
epg: speed up the initial epg creation
pvr: added support for timers in subdirectories
libhts: revert the changes to libhts, so it no longer uses libTcpSocket/libPlatform
pvr: nuke libTcpSocket and libPlatform
pvr: fixed some merge junk
platform/win32: moved the static variables in os-threads from the header to a separate cpp file. issue #490
pvr: renamed CPVRDatabase::AddClient() to Persist() and pass an AddonPtr for consistency
pvr: cleanups and cosmetics in CPVRDatabase
pvr: stick the table creation in a transaction, and don't try to continue when the tables couldn't be created
Release 1.3.4 (Fix for #13, little Bugfix)
sidebar help stuff. looks bad now.
Merge branch 'master' of github.com:marykw/RBOR
fixed something that was troubling me about the big green thing
Activ statistic
Merge branch 'master' of github.com:masdeft/kmh
Activ statistic
Started to port code from sample application, currently in broken state
Various updates, sorry for the short comment, as I'm pushing up for collaboration even though the codebase is unstable
introduced cracked distance-measure for alignment clustering
apparentls it's spelled with two a's
Релиз MaxSite CMS 0.77
Deleted files in master
cleaning up makefiles
merged makefiles
Add information about the application/vnd.tcpdump.pcap MIME type.
Update Action codes for handle_action function according to 11s amendment.
In reviewing tcpdump.c, I found a minor issue with a call to malloc()
failing to check it's return value in file 'tcpdump.c' in function
'MakeFileName'.  Here is the resulting patch below :)
     In reviewing addrtoname.c, I found a minor issue with a call to
malloc() failing to check it's return value in file 'addrtoname.c' in
function 'LookupBytestring'.  Here is the resulting patch below :)
Merge commit '477fe09d005dd951c6404f843a75811fdc993167'
Sanity Checking added to addrtoname

Added return value checking for tp->e_bs against NULL to see if memory
was actually allocated :)

Conflicts:
	addrtoname.c
Sanity Checking for malloc

Added sanity checking for return value to filename being equal to NULL

Conflicts:
	tcpdump.c
Indention should match now

The indentation should match on this file now
Add missing closing quote.
Merge remote-tracking branch 'github/master'

Conflicts:
	tcpdump.c
Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump
Implemented some more closing logic.
Set filetype specific settings via filetype and setlocal

This has the benefit that all my desired settings are applied to the current buffer whenever I switch the filetype. Not just the default ones.

Also juggle filetype enabling up, so it's more clear it's not PHP specific.

Treat .ru files as ruby files too.
modify atmo
Merge branch 'master' of github.com:mfroede/CG2

Conflicts:
	CG2-Weltanschauung/src/index.html
refer to the correct attribute.
add missing attributes for build_prereq_pkgs and autoconf_opts.
simple script
submodules
fix console history
fix camera transformations
import jars from 3rdparty.
now doesn't refresh thread if thread has no posts omitted
Check the return of 'check'.

To check rules, 'check' was called but its return value was not compared
to 'true', the new 'chk' function does this.
Fix double free error.
GoldenLeastSquares minimizes the residual using a golden section search instead of a bisection search.
Removed comments and unnecessary function.
added background-size hackeryphoo
remove khash#kh_debug
GETARG_x should return int, not int32_t
Avoid memcpy() on copying structures.
Merge pull request #501 from monaka/pr-avoid-memcpy-on-copying-structure2

Avoid memcpy() on copying structures.
Auto-generated endpoint assignments for 0.9.196-1
Auto-generated dumps and diffs for 0.9.178-1
마더파더!!!!
time.h for timeworks
Adding basic mocks for LoginActivity
key_commit: added officers import
key_commit: owner report
key_commit: report tweak
key_commit: tweak to get this report to finally work
key_commit: re Add abstract back to tax year
key_commit: revise tax receipt for L J printer on T5002; update format of ITEM on T5001
Refactor.
Add maple for master end.
Remove README.md, because it wasn't real markdown

It turned out the === XXX === sections were something custom and they
don't show up formatted in github.
changed content readme
Fixed: https://github.com/ncgr/quorum/issues/6
Added max_sequence_size config feature.

* Allow for user specified max input sequence size. See
  lib/generators/templates/quorum_settings.yml for more information.
Version bump v0.7.0
Merge branch 'master' into data_export
SSH bug fix.
- fix for Valuetext in Buttons
usrp: fix for rx_frontend_core_200 dc offset

Mask off upper bits when setting a constant offset (I and Q regs).
The sign bits (if negative) can flow off into the flags field.
usrp2: work on alternative stream destination
usrp2: host and fw implementation for fifo control
usrp2: added vrt pack/unpacker to fifo ctrl
usrp2: integrated fifo ctrl into usrp2 modules, implemented window'd acking
usrp2: implementation of timed commands working
usrp2: permanent timeout increase for timed commands
spi: work on fw support for simple spi core
fifo ctrl: spi core work and host implementation
fifo ctrl: ~usrp2_fifo_ctrl acks, usrp2 DCM workaround, bootloader no blinkie
fifo ctrl: various tweaks
fifo ctrl: use regular iface for U2_REG_MISC_CTRL_CLOCK
uhd: added setup sleep to tx waveforms
fifo ctrl: implement timed command feature detection
fifo ctrl: code reorganization and integer wrap-around arithmetic
sbx: no readback during tuning, cache lock detect status when read
sbx: mods for PLL sync reset
sbx: various fixes and tweaks for locking
Merge branch 'maint'
Merge branch 'master' into next
utils: fixed Windows images downloader bug
Limit touch-grep to only SDK/touch/src/
Merge remote branch 'origin/master'
Update .config files in .gitignore
Changed comment in pom.xml.
Added notice to configuration of maven-license-plugin.
Updated license headers.
serverID -> serverId (#393 Ensure all fields follow naming convention)
Also handle the case of missing shared lib for sctp
Refactor ChunkedWriteHandler to remove synchronization which can have bad side effects like deadlocks. See #297 and #301
Optimize UniqueName.compareTo(other) slightly

Replaces a manual check of IDs with one built in to Java

At least it makes the code smaller!

Signed-off-by: Cruz Julian Bishop <cruzjbishop@gmail.com>
Merge pull request #543 from CruzBishop/uniquename-opt

Optimize UniqueName.compareTo(other) slightly
t -> x
Added remapping of bnodes to the Ntriples parser (issue #79).
Merge branch 'master' into rdfa
Restored original 0017.out
Sanity checking for overlapping frags (#956)
Issue #787 (the main gapsource gone, still not ok)
commit the recent changes to ita
Updated Rails 3.1.x deps
Added Gemfiles for Rails 3.2.x
Prepare for 3.1.5 release
Alternate fix for textarea/newline issue

Also moved the Rails 3.2.3 textarea fix into separate file and avoid
loading it unless running on Rails 3.2.3.
Never try to suppress _id field
MPLS packet headers and type
Add MPLS support to libopenflow, while trying to avoid breaking stuff
Adding smart tab mode to the arsenal.  Source is https://github.com/jcsalomon/smarttabs.
options merge for getposts, typecheck added
Remove _ext.c extension module from being built.
Merge branch 'master' of github.com:numba/numba
Finish strongly connected types, pass test_cfg_type_infer
Allow optimization to be an argument.
Option for S3Resource.sqltable to produce simple flat JSON, consistent behavior of S3FieldSelector.contains (ALL by default, not ANY)
Modified field query format, fixed a bug in search helper...

Also modified tests that use the helpers, and fixed some minor
issues.
Commenting change
Removed global modifications to Array prototype; fixed prioritylist javascript
Merge pull request #321 from copiesofcopies/1199-fix-js

Removed global modifications to Array prototype; fixed prioritylist java...
Merge pull request #318 from aviraldg/complete-staff-report-tests

Modified field query format, and made other minor changes.
Merge pull request #319 from christopherliu/master

Comment update
Replace pr_person_represent with new S3Represent version
Merge branch 'master' of git://github.com/nursix/eden
pr_PersonRepresent completed, fix bug in represent, deprecate some old code
Revert per-record split() to _setup-wise split
show_link in __call__ must default to True, not False.
Revert Time widget change as breaks Task updates
Squashed commit of the following:

commit fd2261dc86cf7afbefef0b1b7232a24b90a05850
Author: Dominic König <dominic@nursix.org>
Date:   Fri Oct 26 17:48:41 2012 +0200

    cursor for treemap.

commit 29f5c5f56ae09bb2c5f2b2eae52afb28b5d487e5
Author: Dominic König <dominic@nursix.org>
Date:   Fri Oct 26 17:16:43 2012 +0200

    Minor CSS tweak

commit 357f74a63a69ce4c9ad6b1873dbacee9e0155c95
Author: Dominic König <dominic@nursix.org>
Date:   Fri Oct 26 17:04:33 2012 +0200

    Improved labels, use real population count where available.

commit e51389a9f9d65171a4b782047fe0c614848a9094
Author: Dominic König <dominic@nursix.org>
Date:   Fri Oct 26 14:15:34 2012 +0200

    Render indicator value, Location name and level properly in tooltip.

commit 1b99ccdcd41a7c8ccad110bdf1b1e23d68a6195c
Author: Dominic König <dominic@nursix.org>
Date:   Fri Oct 26 11:48:55 2012 +0200

    Remove the tooltip when clicking anywhere in the graph.

commit 989f8bdccaa502fb6bc8d1009fc3b62b7e30943f
Author: Dominic König <dominic@nursix.org>
Date:   Fri Oct 26 11:13:07 2012 +0200

    Show only 1 level down, CSS tweaks

commit e91a1df2e4432cb59cb8bbfeae22f7febb6716cb
Author: Dominic König <dominic@nursix.org>
Date:   Fri Oct 26 08:27:22 2012 +0200

    Specific tweaks
Vulnerability: improvements for graphs.
Improvements for graphs.
Ensure auth_user fields get configured (for IS_LOWER() on email for example), fix missing confirmation message for Members
OptionsWidget breaks with skip_post_validation=True
Merge branch 'master' of git://github.com/flavour/eden
Put OptionsWidget back into task.
Some fixes for vulnerability analysis graphs.
Minify
Vulnerability: Fix created_by/approved_by represent in Reports, small optimisation tweaks to Reports controller, Reload vdata onapprove, Indicator on DrawerTop
Merge branch 'master' of git://github.com/nursix/eden
Vulnerability: Optimise Reports page
Merge branch 'master' of git://github.com/flavour/eden
Vulnerability: Image Viewer complete, some optimisation of vdata(), rdata() & tmdata() by caching in session
Merge branch 'master' of git://github.com/flavour/eden
Consolidate CSS/JS to minimise required parallel threads, Vulnerability: Optimisation, work on Volunteer Popups
Merge branch 'master' of git://github.com/flavour/eden
Refine ssh command
improvements to DataType.Date.parse

- return Date object when passed one (fixes #2530058, closes #2530059)
- accept timestamp as number or string
- remove obsolete workaround in validation
update travis to test branch
add master to yaml
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
revert .travis.yml on master branch
Merge remote-tracking branch 'upstream/master'
Patch to support title attribute for each column
Upgraded prettify to r224
Removed unneccesary Prettify files from Panel docs.
Update model validate documentation

The model validate method is meant to async and take a callback.
Update to the docs to match this intent.
consolidate indention
Update example to use mutiple attribute validation

Also address stylistic feedback
add back new line
Backtick all code samples and emphasize `error` ev
Restructure success/failure paragraphs
Add `error` event note in first paragraph
Tweak Model's user guide docs for its `validate()` method.
Added prettify.css
Update event-move to keep track of -ms-touch-action property
wip on issue
Revert "wip on issue"

This reverts commit 9144fb6b650c7a52e964be6fb8de971d289f0f97.
refactors drupal.pull allowing it to work in all src/dst scenarios
removes pprint include
Merge branch 'gh-2' into develop
better handling of drupal.pull into local
Hotfix from 'gh-1'
Merge branch 'gh-2' into develop
adds username to rsync calls; fixes root spelling type
removes set_files_perms; tweaks force_files_perms
Merge branch 'develop' into gh-2
replaces cp -r with tar to include dotfiles; pep8 corrections
Run the application via index scripts. Include bootstrap instead of paths.
Category list is added to the specification
Фикс сериализации для урла редактирования персоны.
Added missing bundles for launch & test
Added solrconfig.xml this has a UpdateRequestProcessorChain for creating uuids
Using the UUIDField
No need to create UUID in Python, now done within Solr.
oxpoints importer
Add forgot password view
ajax login check
fix m3p token generation
Merge pull request #37 from driftx/master

Add m3p token generation
getting closer to first try
almost working
Update Django to 1.4.1
Move config to config.rb, add admin "levels"
RT #77736, END blocks should run after die
[min] improoved
Update SDK and version info for 3.0.12.0
fix news
Bug #63162 - parse_url does not matches password component
adding test phpt
synergy ftl. Removed duplicate fields.
fix test and move to proper place
add bug #63162
Merge branch 'PHP-5.4'

* PHP-5.4:
  add bug #63162
  fix test and move to proper place
  synergy ftl. Removed duplicate fields.
  adding test phpt
  Bug #63162 - parse_url does not matches password component
  fix news
Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
Adding gui elements
Adding gui resource files
Split out ui and xml utilities into separate packages
The following classes have been refactored into interfaces:
Recommitting: 'The following classes have been refactored into enums:'

GraphicsManager
InputManager
ResourceManager
ScriptManager
ShaderManager
TextureManager
WindowManager

(Network manager is required to extend Thread, thus it cannot be an
enum-- will revisit this later, but since networking is very much on the
back burner, I'm not worried about that at this point)
New + Maven
And actually work without audio working. Again.
initial import
get the build to work, remove non-existing maven modules
fix some eclipse classpath issues
fix location of sigar source jar
fix mica icon links
change prefix
make sure you define M2_REPO in eclipse, otherwise, all the "unused" imports will be removed
this never worked how we wanted it to anyway, making it dead weight
rhq is the best
custom JMX plugin that can be used to manage/monitor mbeans
rhq logo
new event images
the final merge of /etc from red hat repo to rhq
the final merge of /modules from red hat repo to rhq
crossing fingers svn doesn't barf
the final merge of /modules from red hat repo to rhq
crossing fingers svn doesn't barf
the final merge of /modules from red hat repo to rhq
crossing fingers svn doesn't barf
the final merge of /modules from red hat repo to rhq
crossing fingers svn doesn't barf
the final merge of /modules from red hat repo to rhq
crossing fingers svn doesn't barf
the final merge of /modules from red hat repo to rhq
crossing fingers svn doesn't barf
this should be the last
this is trivial change just to test the svn:externals
Refs #3216 adjusting right size of new flags, since the size is hardcoded in the UI.
Also making flags appear couple pixels higher 

git-svn-id: http://dev.piwik.org/svn/trunk@6713 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Refs #3293 Do not display loading icon when loading N widgets on dashboard (would be OK displaying it when reloading one widget only though)

git-svn-id: http://dev.piwik.org/svn/trunk@6714 59fd770c-687e-43c8-a1e3-f5a4ff64c105
slick2d added; text support
fetch also update the remote repositories if needed
Fix left cruft after bad merging
Timezone PHP error v4
Use XML Decoder instead of ReadAll -> Unmarshal
Se cambio la funcion dameExtension para que sea compatible con php 5.2
inline, fast list
minor
stats fix
cloud inline
I committed it
Merge branch 'master' of github.com:proreco/HW8
minor css and going on with add item feature
修改lib依赖
Only .ico for favicon
Improved String Lexing to Support Escape Codes
Adds '#' unary operator

The operator precedence for unary ops was also incorrect.
This has been corrected. :)
fix second row update bug; further reduce memory usage by sharing g[i] and g[i+1] next generation values; reduce sum calcuation repetitions.
added links and acknowledgements to address issue #11
fixed broken link
Merge pull request #12 from gregcaporaso/update-acks

Fix for issue #11
Adding new test case select-join-test.js
Merge pull request #376 from mtipnis/master

Adding new test case select-join-test.js
generation of hooks and generation of variables added
Merge branch 'robots-1.9.5' of http://github.com/qreal/qreal into robots-1.9.5
add more ideal gestures
add more ideal gestures
Remove spurious dependency.
Remove old references to LAPP repositories
[maven-release-plugin] prepare release ccm-3.1.2
if xml output indentation is not supported, ignore it
if xml output indentation is not supported, ignore any errors
ensure output-dir value is passed to compiler
no longer use :use; clean up required namespaces
update ant task and maven plugin options; update documentation
mouse + build fix
Merge remote-tracking branch 'origin/master'
remove second definition for PostS#subscribe_replier
Merge pull request #240 from joxxoxo/small_refactor_for_post

remove second definition for PostS#subscribe_replier
Removed sorting of attribute names in controller generator.

I believe when people use generators, they typically order the
parameters on the command line in an order that makes sense
to them.  Sorting them in the generated code  makes the order
seem more arbitrary to humans, even though it's less arbitrary
to computers. :-)

Example:

    rails g scaffold Post title:string content:text

The human chose to put title before content. Sorted
attributes in the generated code work but don't match the
human's intent:

    params.require(:posts).permit(:content, :title)
Update test to match new non-sorting of attributes.
Merge pull request #7740 from BMorearty/dont-sort-params

Removed sorting of attribute names in controller generator.
Add test to avoid regression of 4a86362
bump AS deprecation_horizon to 4.0
Merge pull request #6764 from frodsan/patch-4

bump AS deprecation_horizon to 4.0
Fix find_in_batches against string IDs when start option is not specified.
Merge pull request #8073 from alexisbernard/fix_find_in_batches_start_option

Fix find_in_batches against string IDs when start option is not specified
Fix the the backport of the object dup with the ruby 1.9.3p194.

At the end of initialize_dup was added the call to super if it exists,
so it also works with 1.8.7 where initialize_dup doesn't exist.
This issu was introduced with the pull request #6324
Merge pull request #6682 from acapilleri/dup_validation_fix_backport_for_1_9_3

Dup validation fix backport for 1 9 3
cv8: write absolute source file names
GitHub Issues : #5 : Segunda parte : Seleccion de corrientes a guardar y ejecucion.
+legit http://git-legit.org
solarized
Added debugging code.

Signed-off-by: Peter Reiher <reiher@inktank.com>
generate Pages controller
delete index.html, edit routes(root path)
edit database
Quote strings in navigation.
added BodyParserEngineXml
enhance inline docu
upgrade xmlmapper
changelog
Merge pull request #65 from roughy/feature/parse_contenttype_application_xml

added BodyParserEngineXml
more docs
Merge branch 'develop' of github.com:reyez/ninja into develop
Supporting INF & NAN as numbers, adding unit tests & little supported functions lifting.
Merge branch 'evaluer' of github.com:rezzza/Math into evaluer
Lock juici at latest alpha
Update app/Resources/doc/manual-tecnico/Contents/introduccion.md

Se agrego texto de Introduccion
Merge pull request #6 from rajotico/patch-2

Update app/Resources/doc/manual-tecnico/Contents/introduccion.md
Added base files
Added tests
Fixed document
got queuing asynchronus reads and writes working.. Behavior is a little weird if multiple processes are reading the same file though. :-P
Little python script that will hopefully move the mouse at a specific interval to keep the screen from blanking.
Оборудование -> Другое - добавляем проверку деталей поданных объявлений
Бизнес и партнерство -> Готовый бизнес -> Бизнес под ключ
Revert "update"

This reverts commit 09bf2c5510bc9a1d3c0bb544a450a78adb861832.
commented-out auto folding config
fix calendar for overview view
default new issue without start date at toda
coisas da jo
Merge branch 'master' of https://github.com/rui981/AEDA
add off screen rendering prototype
add links to internal doc pages

git-svn-id: https://svn.salilab.org/imp/trunk@14991 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
expose typedefs to doxygen

git-svn-id: https://svn.salilab.org/imp/trunk@14992 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
add page talking about dependency computation

git-svn-id: https://svn.salilab.org/imp/trunk@14993 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
remove unused code from example

git-svn-id: https://svn.salilab.org/imp/trunk@14994 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
add graph to readme for example to show what output looks like

git-svn-id: https://svn.salilab.org/imp/trunk@14995 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
ref dependencies page in DependencyGraph decl"

git-svn-id: https://svn.salilab.org/imp/trunk@14996 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
clean up wording a bit

git-svn-id: https://svn.salilab.org/imp/trunk@14997 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
special deoxygen version of object macros is no longer needed

git-svn-id: https://svn.salilab.org/imp/trunk@14998 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
updates to dependencies page

git-svn-id: https://svn.salilab.org/imp/trunk@14999 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
minor doc fixes

git-svn-id: https://svn.salilab.org/imp/trunk@15000 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
simplify value macros

git-svn-id: https://svn.salilab.org/imp/trunk@15001 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
doc cleanups

git-svn-id: https://svn.salilab.org/imp/trunk@15002 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
hide __hash__ method for doxygen as it isn't really relevant, just needed to make things work as expected in python

git-svn-id: https://svn.salilab.org/imp/trunk@15003 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
add a silly example for rmf.link concept

git-svn-id: https://svn.salilab.org/imp/trunk@15004 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
answer for problem 26 in perl
Renaming files to please ant.

"If the names don't fit, do not commit!"
one more macro test sdisabled that lipped through the net before.
disabling scaladoc tests. Don't know how to fix them to make them work under SIP 18.
One more macro test to disable for SIP 18.
Merge commit 'refs/pull/395/head'
View uses Transform2d instead of Matrix (typo bug)
pe13, pe19
DOC: stats: make discrete distribution docstrings use templates.

Also fix a typo.
DOC: update stats tutorial.
DOC: changes to stats tutorial.
DOC: added instruction on how to use help() for distributions.py
MAINT: fix reST issues in stats tutorial and skellam distribution.
Merge branch 'pull-205-distdoc' into master.

This merges the cleaned up version of https://github.com/scipy/scipy/pull/205.

Cleanups done to reST formatting, squashed and reordered commits, and undid a
change to test_continuous_basic.py (described on the PR).
Updated event coverage files with new builder, after merge from master. This commit contains only -coverage files
添加model模块
添加model/Model.replaceAttr函数
引进Model.ModelData,实现自动调用关联数据
[version] beta version bump (0.9.8.beta.1)
Merge pull request #389 from portertech/version

[version] beta version bump (0.9.8.beta.1)
crud spools metalls
seeds
Merge branch 'release/v0.5'
Site updated at 2012-05-11 07:27:22 UTC
minor fix when the relevance values array is empty.
Turn grunt.log into a readable stream
Build the symlink example when building and uploading examples.
Introduce ~: method (aka preprend) to Projection2-21. Fixes issue #75.
Merge branch '1.0'

Conflicts:
	src/main/scala/scala/slick/lifted/Projection.fm
Updated to supported languages as of 20120801.

This updates the supported languages to the ones listed in the [Language reference](https://developers.google.com/translate/v2/using_rest#language-params) as of 20120801.

Specifically it adds:

* Azerbaijani (az)
* Basque (eu)
* Bengali (bn)
* Esperanto (eo
* Georgian (ka)
* Gujarati (gu)
* Haitian Creole (ht)
* Kannada (kn)
* Latin (la)
* Tamil (ta)
* Telugu (te)
* Urdu (ur)
Fixes typo in ohm-contrib link
Merge pull request #51 from Sush/master

Fixes typo in ohm-contrib link in README
Add: Tracks database adapter and initialization
Switching to CDN JS for html5shiv

Merges #1713
[api] Remove users_controller_decorator

Developers will now need to add this themselves, or use an authentication extension which already provides it
Refactor Spree::BaseHelper#variant_options

Fixes #2039
Add disclaimer for separate execution in select2 method

[ci skip]
Refactor layout templates

Merges #1361
Order#merge no longer uses Order#add_variant

This is because a LineItem may have extra information attached to it, which would be lost with the add_variant call

Instead, what we do is one of two things:

1) If the line item with that variant already exists then we increment the quantity for that line item and save it. Everyone goes home happy.
2) If a line item with that variant doesn't exist, then we re-assign the old line item's order_id field to the current order object.

Number #2 comes with a caveat: we *must* reload the old order's line items because otherwise the re-assigned line_items would be destroyed when order.destroy is called.

Fixes #2179
Remove Square mirror from script/ci.
Remove tagging green build from script/ci.

Jenkins isn't happy about this and it's not particularly useful for this
codebase since it doesn't get deployed anywhere.
--doc-exclude supports globs same as style exclusion.
Update documentation.
2.5.0
Rename QueueFileImpl to QueueFileJava
Add a command to colorize code; expand the generate rule; fix a reserved word collision
Update doc/source/resources.rst
problems using lyra with new conditional dispatch code
Merge remote-tracking branch 'upstream/master'
merged changes

merged upstream changes from master
added in .create to the examples in the lyra code
small edits on the vso tutorial
found a data sub-directory - removed it.  Unclear where sunpy is storing data
edits to the VSO tutorial
Merge branch 'master' of git://github.com/sunpy/sunpy
Merge remote-tracking branch 'upstream/master'
small changes to vso tutorial
more text on the VSO
more tutorial
more tutorial
Merge remote-tracking branch 'sunpy/master'
updated with latest fixes and still working on the tutorial
more edits to the VSO tutorial
more vso tutorial
finished first draft of vso tutorial
spell checked first draft of vso tutorial
Merge branch 'master' of https://github.com/sunpy/sunpy
Snippets: redesign for JavaScript, C and C++

Create a "cfamily" snippets file that contains what looks the same in C, C++ and
JavaScript code. Then create a snippet for C that will contain what is not
exactly the same with JavaScript (e.g. a for in C is usually "int i" instead of
"var i"), then the ones specific for C++ in its own file.

There is still the need to find a way of splitting Qt only snippets to its own
file.
SCs editor
A.Lozicky, A.Svitenkov
M install/gitk/gitk-dist.sh
 M sbin/git-describe-remote.sh
client work:

  o more object orientation
  o use a standard listened pattern
Merge pull request #1202 from manoj2378/trigsimpRecursive

Improved trigsimp for sin(x + y) and sinh(x + y)
Add Andreas Kloeckner to the AUTHORS/aboutus.  Welcome to SymPy!
add signsimp to simplify.py

This should probably be part of symplify()'s procedure, right after

    original_expr = expr
    expr = signsimp(expr)

Any unevaluated Muls that were introduced that weren't changed are
restored to their original Add if they still remain after making
the substition. e.g. exp(y - x) -> exp(-(x - y)) is restored to
exp(y - x) if no change was effected. However, something like
exp((y - x)*(b - a)) ->-> exp((x - y)*(a - b)) does not have the
unevaluated Muls remaining so it there is nothing to change back.
use signsimp in simplify
signsimp watches for production of non-Basic expressions
simplify use of simplify flag in matrices

Cleaned up the use of simplify and simplified in matrices.py.

It's confusing to know which word to use to say you want to simplification to be used (and there was one test that had used the wrong keyword). The way I've done it now is to not have two keywords: set simplify to True if you want simplification (defaulting to sympy's simplify) or pass your own function to use that instead. There is no need for two words (simplified to use simplification, defaulting to sympy's simplify and simplify to define a different function). The use of simplified now raises a deprecation warning.

eigenvects now accepts a custom simplifier like the other matrix functions.
use signsimp in eigenvects
correct use of simplify flag in solve test
keep sympify from allowing autosimplification into Mul
remove use of real_root in checksol

The two solutions are now obtained; and no solution is found for the
test that formerly had the [1/3] as the solution (and that was confirmed
at WolframAlpha).
inferences raises an error on Number input

    Some atoms should raise an error (like Numbers) and others
    (like Symbols) should not. A commented-out test was uncommented.
Geometry: simplify coefficients
Merge pull request #1135 from smichr/3109c

3109c
Nicht den ganzen Beitrags-Content-Div, sondern nur dessen Kind-Spans editierbar machen
refining buttons.
updated to use latest zconnect client
Practica4 version4
optimize client log info for distributedClient
drop metric logic of distributed server, reuse metric of hdfs
optimize DistributedClient.waitMaster(), initialize will wait even master is broken
ファイル選択ボタンを表示しつつ透明にする
add some more optional OGD fields
when dowloading the ISO language file a DB connection may not be required
new file: check OGD metadata consistency
Adding an outline for our report
Finished test cases for titon\utility\Validate
Set timezone to always use UTC
Updated titon\log\Logger
Added test cases for titon\utility\Time
Started implementing the titon\libs\validators
ALSA: asihpi - Revert module_pci_driver conversion for asihpi.c

It contains non-standard call.

Reported-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge branch 'topic/misc'
adding fftw-3.3
adding Date-Simple-3.03
add bundle
delete
initial bulk commit
remove superfluous dependencies
move tests to own project
fixed-modified: rel/gcd/gcd.c
gui stream and jog for grbl
Explicit global HTTP version tag
Protected creation of votes.
Minor tweaking of text order and css for INSTALL.html
Removed caching from TestRunStats in an effort to resolve CUANTO-70.
revert commit d990b30

Commit d990b30 was intended to fix issue #122 but my testing was flawed, so
I'm reverting it. The real issue seems to be a bug with reltool not
honoring app overrides of sys-level mod_cond settings.
add eclim.vim
errror
Gilt fix
thepea
crawl uncoment
upgrade
Merge remote-tracking branch 'origin/master'
Fixed link js
FIX: updated code in PolicySystem, InspectorAgent
Write out a WaitTime at the end of vevery log
Allow clients to populate lookup table before setting cursor pos

Fixes ibus-skk Issue#51.
* re-added the installation and base count checks

* not in its final shape though
* UI engine: grow up sprite slots