labofsahil/github-event-dataset-2012 huggingface dataset:
Adding assertions into the new great socket options from Scott
add range checks (and tests) for Duration, see #2064

- also improve hashCode and allow negative string representation
fix SchedulerSpec
Added .scalastyle to .gitignore
Use maxSampleSize correctly. See #2065

* Added failing test
* Fixed wrong drop
* Boy scout cleanup
Merge pull request #451 from akka/wip-2065-AccrualFailureDetector-maxSampleSize-patriknw

AccrualFailureDetector doesn't use maxSampleSize correctly. See #2065
Merge pull request #450 from akka/wip-checked-duration-∂π

Wip checked duration ∂π
Merge remote branch 'origin/wip-adding-assertions-in-IO-√'
Improved the docs for dataflow concurrency
Removed code for tutorial, already removed in docs since duplicate in Typesafe/Akka getting started guide and template
Replace Java serialization of DaemonMsg by protobuf. See #1755

* Serializers for DaemonMsgCreate and DaemonMsgWatch
* Protobuf for DaemonMsgCreateProtocol, PropsProtocol,
  DeployProtocol, DaemonMsgWatchProtocol
* Removed unused MailboxProtocol.proto
* Fixed wrong serializeActorRef in DurableMessageSerialization
IO.SocketOption to link to java docs

Unfortunately scaladocs don't seem to support urls, or i would make
these link directly to the Socket docs
IO.SocketOption: improve SoTimeout documentation wording
IO.SocketOption: add require around TrafficClass range restrictions
IO.SocketOption: catch exceptions and forward them back to sender
IO: use defaults for SocketOption param rather then overloading

Now that we're not targetting a 2.0 release we can break backwards
binary compat.
IO#fowardFailure: catch NonFatal rather then all Throwables
IO.SocketOption: switch back to one line-per case
Create test-fixture for durable mailboxes. See #2061

* Improved DurableMailboxSpec for stand alone usage
* Changed build to publish DurableMailboxSpec in akka-mailboxes-common-test
* Changed documentation of durable mailboxes and added full example of
  how to implement a durable mailbox, with test
Merge pull request #454 from srp/master

assorted IO.SocketOption changes from last pull request comments
build: Remove broken tar and nptar targets.

They produce archives that do not contain all the files needed
to build OSCAM. I doubt anybody uses them since they have been
broken forever or at least since r3715 (when the new Makefile
was introduced).

git-svn-id: http://streamboard.gmc.to/svn/oscam/trunk@6776 4b0bc96b-bc66-0410-9d44-ebda105a78c1
build: Remove build support for csgbox.

This out of tree module have no place in the build system.

git-svn-id: http://streamboard.gmc.to/svn/oscam/trunk@6777 4b0bc96b-bc66-0410-9d44-ebda105a78c1
build: Cleanup files in Distribution only when `make distclean` is used.

git-svn-id: http://streamboard.gmc.to/svn/oscam/trunk@6778 4b0bc96b-bc66-0410-9d44-ebda105a78c1
build: Switch to simple target by default.

git-svn-id: http://streamboard.gmc.to/svn/oscam/trunk@6779 4b0bc96b-bc66-0410-9d44-ebda105a78c1
Added t8059 - parser failing with a ghost directory in a variant.

If we create a ghost directory in a variant, it doesn't have a valid srcid. The variant_get_srctent() function needs to account for this and return a NULL srctent as a result. This way the parser can produce a sane error message.
Added t8060 - make sure deleted variant dirs get srcid reset.

If a variant dir goes away to become a ghost, we need to set srcid to -1 so that we don't try to load a tup entry that no longer exists.
add support for tls connection

If user is configured to use tls but server dosn't sport it,
session start fails. Need to add option "optional" which allows
to use standard connection if tls is not supported.
Stream compression almost done
zlib finally works as it should
check if server supports starttls or compression
Stream compression - final touches
Merge pull request #3 from lavrin/stream-compression

Stream compression using Zlib
change Iterator to Traversable
Merge branch 'master' of github.com:goodby/csv
Move stencil param adjustment to GrClipMaskManager, attempt to make GrGpuGL::flushStencil readable

Review URL: http://codereview.appspot.com/6295046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4173 2bbb7eff-a529-9590-31e7-b0007b416f81
Speculative Android GM blend fix (unreviewed).



git-svn-id: http://skia.googlecode.com/svn/trunk@5257 2bbb7eff-a529-9590-31e7-b0007b416f81
warning fix (unreviewed).



git-svn-id: http://skia.googlecode.com/svn/trunk@5258 2bbb7eff-a529-9590-31e7-b0007b416f81
Separated spacing patterns.
Added autotest_pattern for styles that have an accompanying .testinfo object.
added start of performance patterns and unit tests.
builds off base patterns for object names and numbers.
Rearrange autotest structure to facilitate easier exporting patterns.
Added travis build file
Fixed test for "dump" function if xdebug>2.2 is loaded
set travis-ci icon to master
Fixed bug: softmmu can not find tlmu memories and abort
バージョンの記述を0.2.0にした
device ...
move CommuniPortConfig directory
...
add task file
add opera file
...
delete
added OpenCL support to PMX
ex01: implement rotation around the Z axis
add du03 directory
user service checked in
make drag and drop work
Revert "背景"

This reverts commit f083ac9bf3342730d4d005bdb962c80850c75dff.
Revert "Revert "背景""

This reverts commit 63e5e70de669c29b1ad70fe97fa7b14d014daa2c.
Revert "Revert "Revert "背景"""

This reverts commit ed345e7e2fb3565005d7d09c3c2ab3210775d98e.
Revert "Revert "Revert "Revert "背景""""

This reverts commit 081a7c1e3d12c53e3ad9dc93131801114a631ac7.
Revert "Revert "Revert "Revert "Revert "背景"""""

This reverts commit c64c4dc90ca73f1119e774d33022639355a91e6f.
Test 766: 1.4 Pre
Stable 25: Implements #31
Merge remote-tracking branch 'origin/tests'
Improve Page::edit view
auto upload Mon Dec 17 22:00:21 PST 2012
in SemanticModel.java
//String timestamp = new Date().toString();
			 /* Changed by Jun */
			 String timestamp = new Date().toString().replace(':', '-');
.classpath
revert compiler check for compatibility reasons
add: missing exception qualifiers
Initial cut at reconfiguration README
More README!
Add a minimally usable test
update photo
user update photo
self update photo
self photo update
Tests refactor
New approach to cakefile minifiers
Filtering slow tests
Fixing content type ajax test
Fix quick-test URLs
Ignore compiled test assets
Test dependencies
Merge master
addClass fallback with jQuery algorithm
nitfix: s/Javascript/JavaScript/
continue Javascript -> JavaScript nitfix
Merge pull request #30 from chocolateboy/nitfix

nitfix: s/Javascript/JavaScript/
Cosmetics on add_weights()
Make the temp variable in up_heap()
use in-ns, not ns, when changing namespace in Clojure mode
Fixed - checking if database is empty
forgot the with-cluster entrypoint
Script to recompile once a source file changes

Useful for developing and when the parser work continues
in order to clean up a little bit.
SEI Adjustment
Added code to sync function to delete old gpg backups. Anything over 14 days is deleted
middot!
add descriptions of each file
some changes/ likely working back prop for clayer

Signed-off-by: andrey.arnautov <puffdrew@gmail.com>
metoda do oznaczania taska jako wykonany
Merge branch 'develop' into feature/task-done
wpiety jsRouter
controller do obslugi zadania
ajaxowe konczenie taska + zwijanie
Merge branch 'feature/task-done' into develop
Export empty Trie
Cosmetic changes, makes things more clear.
gingerbread file
test
fixed bug with temporal gap + fixed bug with TAM
Added icons for predefined comic search
Add first draft of StatusIconBackend (Mac).
Wired all the pieces so the first simplest StatusIcon works in the
Samples project (Mac backend only, for now).
Remove unneeded Menu property in the StatusIcon (although, at this
point, I think it would have been better to make StatusIcon inherit
from Menu, or Xwt.Component, rather than Xwt.Widget, so more work to
come after this...)
StatusIcon: As Menu's backend implements NSMenu, we can actually make
StatusIconBackend inherit from MenuBackend, and this way all gets much
more simplified (StatusIcon class inherits now from Menu as well,
instead of Widget).
StatusIcon: now that it inherits from Menu, the only component to set
is the image, so we refactor this to name methods better. Next
refactoring would be probably to use the proper Image class instead of
the path to the image...
Instead of initializing the backend in the setter of a property, we do
it now in the InitializeBackend() call (although we need to call it
manually for now).
StatusIconBackend: Simplify initialization much more by marking
MenuBackend's InitializeBackend() method as virtual.
test branching
Stream interface changed.
removed reopen method from Mojo::Log again
fixed memory leak in Mojo::Headers
reflow generator template
Proper way to update in README.md
Remove the @import in static/css/base.scss
`until` complement of `while`
`chfn` use
LWJGL installation tool
Configure java executable interactively
Fix new substitutions to work also in absence of values.
добавил макрос экранирования _ и теперь использую всегда \idtf
исправление в части 3 (демо алгоритма) шага про добавления посещения начальной и конечной вершин в маршрут
Merge branch 'master' of github.com:laz2/ai_rr
приведены в божесткий вид все разделы chap2, кроме раздела про графовую структуру
добавлены 4 лабораторных работы и проведен рефакторинг
Dodata stranica Linija7N
Add window_id property
Fix for a correct deployment
change name to Fssle
Entities refactoring.
Controllers refactoring.
Routing base refactoring.
Added base product manage feature.
Simplifying the Product entity.
Merge pull request #8 from kulasart/master

Base product manage feature.
release 1.0
disable general index
enable custom domain.
removed unneeded file
Merge branch 'master' of github.com:lsv/series
Make bug fix in commit 6257d5c421 specific to uWSGI
Changed QT_COMPONENTS to a list so word expansion works properly
added factor.py
check if files with common markdown suffixes exist when file not found
did something apparently
Merge branch 'master' of https://github.com/mcm46/lab2.git

Conflicts:
	bin/elevator/Elevator.class
retrieve data as pointer instead of array in match_peid_signature() function
Agregado de gemas
Don't need parens for typeof
UPdates to readme
Compojure sample app based on http://mmcgrana.github.com/2010/07/develop-deploy-clojure-web-applications.html. Found lot of incompatibilities in the code in the article. Fixed issues in the code to make it work with new libraries.
过滤聊天记录中的客服评价
cookie storage cleanup
timestamp in sampling debug message is obsolete
added type for ADC input

In case something changes, just the typedef must be changed.
And it’s more clear where values come from.
minor fix, sizeof(buffer) is better than NUM_AIN*2
Merge branch 'testing' into statelut

* testing:
  minor fix, sizeof(buffer) is better than NUM_AIN*2
  added type for ADC input
  timestamp in sampling debug message is obsolete

Conflicts:
	main.c
using input_t in state.c
using input-type in conf structure
Merge branch 'testing' into statelut

* testing:
  using input-type in conf structure
parallax background, camera fix
BelongsToMiPlan now allows accepting mi_plan_id and assigning and activating it
Get rid of remove_duplicate_and_space_out_status_stamps.rb
Implement rake solr:update
Improve replace_status_stamp errors
Expose new Public::MiPlan#status_dates in JSON
Public::MiPlan#status_dates should be read-only
Expose Public::MiPlan#mgi_accession_id publicly
Rename conflicting test
Enable parallel gem for testing
Merge branch 'mi_plan_extra_attrs' into staging

Conflicts:
	app/models/public/mi_plan.rb
	test/unit/public/mi_plan_test.rb
DRY: changed to process_line() vs. repeated code
Added new EventExample.tar.gz
Add airsightdistance to core static AA , also lower armcir and corerad sightdistance
Move sub build order now inline with arm/core labs
Fix weapon fire angle
MMF save after cp / mv
Merge branch 'master' of git://github.com/nightcracker/PyGG2 into test
Took a look again at rocket explosion physics; still buggy, but not as hacky now.
Add options to commandline client
fix air to vacuum and inverse conversions
Useful for debugging tests of the erlang suite
Enabled verbose, disabled ANSI, disabled interaction with composer in the post recieve script.
Changed from Dublin Core Elements 1.1 to Dublin Core Terms.
BF: removed capitalization of pymvpa_datadbroot to fix broken example
Make everything compile
cucumber fixes...
fixing cucumbers pt2
adding controllers and models for users + schools
"buscar" método > "buscar_por_nome" (#105)
suporte para listar usuários de determinado institutos na página de manipulação de papeis de usuários (closes #105)
Merge branch 'master' of github.com:nsi-iff/bd
adicionando testes para submissão de cada tipo de conteudo
adicionando rota para action submeter para cada conteudo(#62)
adicionando action submeter para artigos de evento (#62)
adicionando action submeter para artigos de periodico (#62)
adicionando action submeter para objeto de aprendizagem (#62)
adicionando action submeter para periodicos tecnico cientificos (#62)
adicionando action submeter para relatorios (#62)
adicionando action submeter para trabalhos de obtenção de grau (#62)
Substituindo tab por espaços
rails atualizado para 3.2.8
Add RandomItem
naps: fix APP_DIR typo, fix basename, add echo

Signed-off-by: Felix C. Stegerman <flx@obfusk.net>
daemon: alive, chk_ok, errlog, ohai @, - info start

Signed-off-by: Felix C. Stegerman <flx@obfusk.net>
clj: ohai PORT; ruby: -E in _d, command -> cmd; deamon

Signed-off-by: Felix C. Stegerman <flx@obfusk.net>
Merge pull request #1 from sferik/fix_typo_in_readme

Fix typo
Merge branch 'master' of github.com:ohler55/oj
commected out structs for rbx compiles
commected out structs for rbx compiles
commented out structs for rbx compiles
commented out structs for rbx compiles
rubinius performance tweak suggested by Brian
rubinius performance tweak suggested by Brian
added new options for symbol hash keys and IO input
spelling fix
fixed bug that did not convert symbols to strings in compat mode
trigger travis
added ascii_only option
notes updated
gave ::Oj::Doc dump a speedup
Making the dump and write speedups available in a release
updated notes
modified tests for more consistent results
updated tests
changed stack allocation to heap for larger documents
fix jsp
Merge branch 'fe005' into okho
Merge branch 'okho' into develop
quiet overly-verbose log msg
RPC over conversation running
accept is now a context manager method, defers close calls
Channel FSM, updated tests
Merge pull request #80 from daf/accept_cm

Channel FSM, accept as a context manager
RS Folien update mit Seitennummern
RS05 more
2012-05-22  Will Deacon  <will.deacon@arm.com>

	* linux-low (__UCLIBC__ && !(__UCLIBC_HAS_MMU__ || __ARCH_HAS_MMU__)):
	Include asm/ptrace.h.
	(PT_TEXT_ADDR, PT_DATA_ADDR, PT_TEXT_END_ADDR): Define only if not
	already defined.
Always create PLT eh_frame section for i386/x86-64

bfd/

2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/14105
	* elf32-i386.c (elf_i386_create_dynamic_sections): Always
	create PLT eh_frame section with SEC_LINKER_CREATED.
	* elf64-x86-64.c (elf_x86_64_create_dynamic_sections): Likewise.

ld/testsuite/

2012-05-20  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/14105
	* ld-elf/eh4.d: Add PLT eh_frame.

	* ld-i386/i386.exp: Run pr12570a and pr12570b.
	* ld-x86-64/x86-64.exp: Likewise.

	* ld-i386/pr12570a.d: New file.
	* ld-i386/pr12570a.s: Likewise.
	* ld-i386/pr12570b.s: Likewise.
	* ld-i386/pr12570b.s: Likewise.
	* ld-x86-64/pr12570a.d: Likewise.
	* ld-x86-64/pr12570a.s: Likewise.
	* ld-x86-64/pr12570b.d: Likewise.
	* ld-x86-64/pr12570b.s: Likewise.
Create PLT eh_frame section if there is .eh_frame section

bfd/

	PR ld/13909
	* elf32-i386.c (elf_i386_create_dynamic_sections): Create PLT
	eh_frame section if there is an input .eh_frame section.
	* elf64-x86-64.c (elf_x86_64_create_dynamic_sections): Likewise.

ld/testsuite/

	PR ld/13909
	* ld-i386/i386.exp: Run pr13909.
	* ld-x86-64/x86-64.exp: Likewise.

	* ld-i386/dummy.s: New file.
	* ld-i386/pr13909.d: Likewise.
	* ld-x86-64/pr13909.d: Likewise.
	* elflink.c (bfd_elf_discard_info): Look for next .eh_frame if
	first one is zero size or discarded.
	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Set most of
	glink_eh_frame contents here..
	(ppc_elf_finish_dynamic_sections): ..rather than here.  Just set
	offset to .glink.
2012-05-22  Pedro Alves  <palves@redhat.com>

	* target.h (store_waitstatus): Move declaration ...
	* inf-child.h (store_waitstatus): ... here.
	* target.c: Move inclusion of gdb_wait.h, and ...
	(store_waitstatus): ... this ...
	* inf-child.c: ... here.
	* linux-nat.c: Include inf-child.h.
	* rs6000-nat.c: Include inf-child.h.
	* spu-linux-nat.c: Include inf-child.h.
Revert the change for PR ld/r13909

bfd/

	PR ld/13909
	* elf32-i386.c (elf_i386_create_dynamic_sections): Revert the
	last change.
	* elf64-x86-64.c (elf_x86_64_create_dynamic_sections): Likewise.

ld/testsuite/

2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/13909
	* ld-i386/i386.exp: Revert the last change.
	* ld-x86-64/x86-64.exp: Likewise.

	* ld-i386/dummy.s: Removed.
	* ld-i386/pr13909.d: Likewise.
	* ld-x86-64/pr13909.d: Likewise.
	* common/buffer.c (buffer_grow): ARI fix: Remove unneeded
	call to abort.
acl+navi
Überschirft freigestellt, Browserkonform
Daemon/Main:
* Richte Thread zum Abhören des Ports 9100 ein
* Das Programm ist nun in der Lage Nachrichten zu senden und zu empfangen
* Erstelle Testprogramm in PHP, dass sich mit unserem Daemon verbindet
README: Point to Lua-Gnome for support of ancient GTK+ versions.
Fix the mesh pattern tests

Mesh patterns don't inherit from gradient patterns and thus this test failed.

Signed-off-by: Uli Schlachter <psychon@znc.in>
Merge pull request #20 from psychon/fix-tests-cairo1.12

Fix the mesh pattern tests
verify that we can perform HEAD requests against node servers by default (note: we totally can)
new ugly tileset
Merge pull request #24 from pjeweb/c68130d867f5cbf0e112858cc4cb9f816e74903d

.php: cleanup and moving settings into seperate file
Upps
Merge pull request #26 from pjeweb/99aca3ceef26b84585927e70cab1227b3bf1cc4d

.php: Deprecate [audio] and [video] shortcode.
Update readme.md to new shortcodes…
Merge git://github.com/gerritvanaaken/podlove-web-player
unbreak the contour window

A long time ago, I tried to improve the interactiveness
of DrRacket when the contour window was open with the
code that is removed in this commit. Looking at it today,
it seems clear that this code was buggy (and, now that
we've had lots of experience with it, it didn't actually
help with interactivity either)

The problem is that the code didn't record enough
information about the change to the editor in the thunk put
into the 'todo' field. It would remember that a particular
range was out of date, but it woudln't remember which
characters were in that range, so when it would go to copy
the characters, it may be getting the wrong characters
(since another edit may have happened since the thunk was
stored in the todo field)

This change also has the side benefit that the time it takes
to change the contour window is now being tracked by the
colorer, which means that it'll give up a bit sooner
coloring less in each go, but hopefully maintaining the
interactivity
adjust the code that maintains the blue "where am I" background
coloring in the contour window to make only a single call to
invalidate-bitmap-cache

It was making two before, which could have pretty similar regions,
leading to two repaints instead of just one. When pushing the down
arrow near the bottom of the visible regions of the definitions text
was causing those two calls to take about 30 milliseconds and after
this change the one call seems to be about half that (but there is
lots of variance so I'm only sure that it helped some, not how much)
don't run follow-log.rkt in drdr
change the way that the delegate text is specified, using
getter/setters instead of overriding a method

this has the benefit that the delegate does not have to be
rebuilt when switching tabs in drracket; we just leave the
old delegate on the old definitions text, and the swap it
back into the editor-canvas when we swap the text% object
itself back in.
Fixed recursion error with __name__
Added missing template for sibling
One moar readme fix
SC#QCADOOMESCLS-386 Changed method name, added some constants, some fixes in locales.
RF#add tests
Merge branch 'master' of github.com:qcadoo/mes
clean test log
Add paint method to TXMMapObject

Signed-off-by: Ragner Magalhaes <ragner.magalhaes@gmail.com>
Call loadObjects method foreach object layer

Signed-off-by: Ragner Magalhaes <ragner.magalhaes@gmail.com>
Indent code style

Signed-off-by: Ragner Magalhaes <ragner.magalhaes@gmail.com>
Don't quit on accept errors.
Don't log accept errors ECONNABORTED ENOTTY
Cleaner test for console #181
add ability to specify SemVer keys for values_for_platform

example:
  value_for_platform(
    [ "centos", "redhat", "suse", "fedora"] => { "default" => "mysql-devel" },
    "debian" => {
      "~> 5.0" => "libmysqlclient15-dev"
    },
    "ubuntu" => {
      "~> 8.0" => "libmysqlclient15-dev",
      "~> 8.1" => "libmysqlclient15-dev",
      "~> 9.0" => "libmysqlclient15-dev"
    },
    "default" => 'libmysqlclient-dev'
  )
update proj added
Event better garbage collection.

This time I have a proof that it incurs amortized constant overhead,
and that the memory use is linear in the minimum possible given the
historyLength constraint.
replace getJSON to .ajax
fixed bug - no coloring feeds wiith undefined number of likes
1 search function
code cleaning
getColorForAmount() improvemnet
Merge branch 'refactor'
Converts README to markdown and update it.

Closes #4
always install env files if project is catkin (updating 0.5.2)
Fixed a typo in variable name.
Fixed a type in variable name.
Fixed the algorithm when hashing non-empty data.
Fixed the documentation of the create() method.
Fixed the compiler warnings.
Fixed transform in the CFB mode.
Fixed the CFB mode and feedback size handling.
Fixed the layout target sizing.
Added the missing value of 'cryptoEncryptInvalidDataSize' key.
Fixed a bug in ECB mode.
Corrected the docs.
Added the first unit tests.
Added the first unit tests.
Added the first unit tests.
Enable passing structs as function arguments.

The current ABI is *not* compatible with System V x86-64 ABI.
The way specified in the spec is complicated which requires passing
small structs using GPR or XMM registers. The way implemented by
this change passes all structs via the stack.
[GNUC] Add statement expression.
v0.0.8g: more tweaks for rescue-mode detection (--mem & --sysctl)
MemoAs コマンドが range を扱うように変更
プラグインのインストールチェックを追加
判定間違いをなおした
after/plugin を vimrc に統合した
VimEnter イベントで代替
Gstatus に ? でキーマップ一覧を表示するようにした
Texture base class added.
Trying sending mail on port 25.
Reign in vimpulse a bit
Added repository README
grep: move configuration support to top-level grep.[ch]

As "git grep" will not stay to be the only command that will know
about the grep machinery, move these to a more appropriate place.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
grep: move pattern-type bits support to top-level grep.[ch]

Switching between -E/-G/-P/-F correctly needs a lot more than just
flipping opt->regflags bit these days, and we have a nice helper
function buried in builtin/grep.c for the sole use of "git grep".

Extract it so that "log --grep" family can also use it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
log --grep: use the same helper to set -E/-F options as "git grep"

The command line option parser for "git log -F -E --grep='<ere>'"
did not flip the "fixed" bit, violating the general "last option
wins" principle among conflicting options.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
log --grep: accept --basic-regexp and --perl-regexp

When we added the "--perl-regexp" option (or "-P") to "git grep", we
should have done the same for the commands in the "git log" family,
but somehow we forgot to do so.  This corrects it.

Also introduce the "--basic-regexp" option for completeness, so that
the "last one wins" principle can be used to defeat an earlier -E
option, e.g. "git log -E --basic-regexp --grep='<bre>'".  Note that
it cannot have the short "-G" option as the option is to grep in the
patch text in the context of "log" family.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jc/grep-pcre-loose-ends' (early part) into pu

* 'jc/grep-pcre-loose-ends' (early part):
  log --grep: accept --basic-regexp and --perl-regexp
  log --grep: use the same helper to set -E/-F options as "git grep"
  grep: move pattern-type bits support to top-level grep.[ch]
  grep: move configuration support to top-level grep.[ch]
change for text-align
yasir.new
Merge branch 'master' of git@github.com:snasir/swf
Merge branch 'master' of git@github.com:snasir/swf
Remove SetEnv
Add setEnv and unsetEnv to System.Environment
Use package imports for tests
fixed a few straggling perms -> mode changes
Reporting: Use the new mode attribute
Added query b=bundle method to bcfg2-admin.
Cleaned up style sheet and made fonts consistent.
Renamed Evaluation to Operation.

The Operation base class represents operations that have yet to consume at least one Operand, and must remain in memory until they do so.
Renamed Expansion to Evaluation.
Replaced rmsgain with avggain
RC Cola background
tanuj test commit
Value checks chips.
 Rotate chips on table.
Haugh: Fixed small typo
Haugh: Removed frames from legend
Haugh: Fixed Fig 4, some parameters
podlaczyłem pod filtracje kategorii mozliwosc przegladania strony "poprzednia, 1 2 3, następna"
frame autoscrolling while selecting with mouse
primary selection change (broken)
faster primary selection
on column_remove; when there is no editor before the height is passed to the editor after
Revert "TIN"

This reverts commit 854e2fbec616733466a08c5708a594f024d9122a.
index
amazon s3 compatibility
По задаче #3598
Hello "world"
Slider
custom scrollbar : better default
R.A.S. : I don't know why but this files are new
R.A.S. : update mail
Add a function to warn when a symbol is already defined
Prevent a namespace from being imported when a symbol is already named so
mark more tests xfail on pypy, skip dualrule.
added fake location
[Ilton Garcia]: Retirada dos testes.
Add requisite in to 0.9.8 release notes
Merge pull request #974 from trane/develop

Develop
Add info about running states from the minion
Merge branch 'develop' of github.com:saltstack/salt into develop
set spell in vim needs more [ power
Add a doc on the extend declaration
1. Make refresh_db() "locale aware"
2. Fix: ret[key] was set to "downloading" instead of <repo name>
Merge pull request #975 from archme/patch-2

1. Make refresh_db() "locale aware"
some monor additions to the release document
Merge branch 'develop' of github.com:saltstack/salt into develop
there are bleeding issues with running reconcile_extend only once

This change both simplifies the process and lower the number of
operations and shortens the search scope for the compile
fix dict ref in requisite in
don't fail out on ssh keys without options
Fix where re.search applied to empty lines

Move the re.search method to ensure that lines are valid ssh key lines, break
out of loop when it encounters errors. Might want to change this into exception
handling of some sort.
sua lai trang buslist de delete
push hang
Added mctsnumrepeat option. Repaired a bug in FORTRAN output of optimized code.
ParFORM: synchronisation in GetRuuningTime

To keep consistency among preprocessed inputs on all processors, the
return value of GetRunningTime() is now synchronised.

Also the code for synchronising the value of termsin(expr) in pre.c was
removed because counters of expressions are synchronised at the end of
each module via PF_BroadcastExpFlags(). PF_BroadcastNumberOfTerms() was
renamed to PF_BroadcastNumber().
Dropdown menus dans l'inscription + réindentation.
Merge branch 'master' of github.com:tuxerr/J2E
utf-8 definition in gemfile
Fix messages retrieval by country code.
Cleaned UsersController

Especially UsersController#update_profile
handle nulls along group by path
added target encoding for javadoc
Textarea patch
bsod fix main fuction bug
evaluate -e in a module context
fix -B with repl
fix fib ruby bench
remove Atomy.make_wrapper_module, use Atomy::Module.new
AST reorganization

* Binary -> Infix
  * lhs, rhs -> left, right
* FormalArguments -> Block::Arguments
* BlockBody -> Block::Body
* Define -> DefineMethod
* Function -> DefineFunction
* String -> StringLiteral
* Hash -> HashLiteral
* File -> ActivePath
* Load AST into the grammar so it doesn't have to specify 'Atomy::AST'.
Fix the Windows build on Japanese systems.

guilib/LocalizedStrings.cpp was in ISO-8859-1.  MSVC only autodetects
UTF-8; if a file isn't UTF-8, it assumes it's in the ANSI codepage, which
depends on the build system.  That means this file was detected correctly
on US English systems (whose encoding is very similar to 8859-1), but
incorrectly on others.

This caused the compiler to choke, since it misinterprets the non-ASCII
characters as SJIS, causing the quotes after the strings to be mojibake'd
away and giving unterminated string literal errors.

Convert this file to UTF-8, so it's autodetected in any system codepage.

This needs to be tested in other build environments.  I don't expect
problems with gcc; it builds UTF-8 sources without trouble.
[win32] Fix incorrect debug output on non-ASCII system
[WIN32] added new EXCEPTION_POINTERS member in exception handling.
[WIN32] move minidump writing function to Win32Exception
Use the Exception abstractions to manage the handling of platform specific exceptions.
[droid] fix single and double long press detection on devices sending touch move events all the time
[guilib] Incorrect check for return value in TextureManager
[guilib][win32] Prevent dereferencing of NULL pointer in GUIFontTTFDX.cpp
[UnrarXLib] Disable incompatible with VS2012 useless def
[libRTV] Use "ntohll" function implementation from SDK on VS2012
[DVDPlayer] Use DXVA codecs defines from SDK on VS2012
Merge pull request #1323 from Karlson2k/Fixes_XBMC_02

[GUI] Small fixes
Fixed: Ticket #13210 - Can't get image from some web site because don't return Content-Type by HEAD method.
Make PartyModeManager.cpp and AddonDatabase.cpp compatible with STL from VS2012
[XBMCTinyXML] Add VS2012 tinyxml libs
Update xbmc/windows/GUIWindowSystemInfo.cpp
Merge pull request #1325 from iroot/patch-2

Update xbmc/windows/GUIWindowSystemInfo.cpp
fixed: No need to fetch the resume point in the thumbLoader as this is already done in LoadVideoInfo. Should also fix the race in ticket #13118 (thanks jmarshall)
changed: Mark those const (cosmetics)
Fixed: Ticket #11882 - Can't get subtitle overlay because m_pCurrent not initialized.
use tomorrow-night theme
Merge branch 'master' of github.com:wd/emacs.d
Remove left padding
Parse error: scheme data state
继续拯救
Fixed #13 with the recommended patch. Still needs a test case.
Resizing complex element

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@147050 a5903396-d722-0410-b921-86c7d4935375
Resizing figures

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@147052 a5903396-d722-0410-b921-86c7d4935375
Fixing TOOLS-665

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@127826 a5903396-d722-0410-b921-86c7d4935375
Fixing TOOLS-1027

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@125288 a5903396-d722-0410-b921-86c7d4935375
renamed m_baseColor to m_backgroundColor
Add coordinate system to interface region

Tracker item: 3118

Conflicts:

	src/generated_mesh_routines.f90
	src/interface_conditions_routines.f90
	src/opencmiss.f90
	src/types.f90
Interface coordinate system add

Tracker item: 3118
Add coordinate system to the interface region

Modification according to Prasad's review

Tracker item: 3118
Changes according to Prasad's comments
Adding coordinate system to an interface

Changes according to Prasad's comment.

Tracker item: 3118
Merge pull request #86 from xyan075/master

Add coordinate system to interface
Interface coordinate system

Interface now has its own coordinate system attached and we no longer use its parent region's coordinate system, when getting the coordinate system for the field in the interface

Tracker item: 3118
Merge pull request #89 from xyan075/master

Interface coordinate system
Check for fibre field for finite elascitiy equations

This avoids getting segfaults later on if you accidentally
pass a geometric field to the EquationsSet_CreateStart routine.
Merge pull request #93 from adamreeve/master

Check for fibre field for finite elascitity equations
Add missing nullify calls

Should fix errors running some examples under Intel compiler
Merge pull request #94 from adamreeve/master

Add missing nullify calls
Merge branch 'master' of https://github.com/OpenCMISS/cm into PointConnectivityMerge

Conflicts:
	src/interface_conditions_routines.f90
	src/interface_routines.f90
	src/opencmiss.f90
	src/types.f90
报错
xiugai
ENH: dynamic docstrings for options API
DOC: document change of to_string() to return unicode
DOC: add openpyxl, xlrd/xlwt as optional dependencies to README
fix mail reading: don't raise invalid byte sequence in UTF-8 when reading non-UTF-8 emails
define NilClass#blank? only if not defined yet
Merge pull request #353 from amatsuda/nil_blank

define NilClass#blank? only if not defined yet
Updaitng changelog
Merge branch 'fix_reading_mail' of git://github.com/mreinsch/mail into mreinsch-fix_reading_mail
Merge branch 'master' of github.com:mikel/mail
Update CHANGELOG
use boost/progress.hpp
experiment with splitting command behaviour out into objects
convert SYST and TYPE commands to structs
updated the destroy for data_stream
Added data_template preview
unicorn
Merge pull request #1 from yoprst/index

unicorn
Don't assume that "char" is signed.

For the C standard char can be either signed or unsigned, it's up to the
compiler, but Redis assumed that it was signed in a few places.

The practical effect of this patch is that now Redis 2.6 will run
correctly in every system where char is unsigned, notably the RaspBerry
PI and other ARM systems with GCC.

Thanks to Georgi Marinov (@eesn on twitter) that reported the problem
and allowed me to use his RaspBerry via SSH to trace and fix the issue!
Allow Pub/Sub in contexts where other commands are blocked.

Redis loading data from disk, and a Redis slave disconnected from its
master with serve-stale-data disabled, are two conditions where
commands are normally refused by Redis, returning an error.

However there is no reason to disable Pub/Sub commands as well, given
that this layer does not interact with the dataset. To allow Pub/Sub in
as many contexts as possible is especially interesting now that Redis
Sentinel uses Pub/Sub of a Redis master as a communication channel
between Sentinels.

This commit allows Pub/Sub to be used in the above two contexts where
it was previously denied.
Check that we have connection before enabling pipe mode
New in INFO: aof_last_bgrewrite_status

Behaves like rdb_last_bgsave_status -- even down to reporting 'ok' when
no rewrite has been done yet.  (You might want to check that
aof_last_rewrite_time_sec is not -1.)
Truncate short write from the AOF

If Redis only manages to write out a partial buffer, the AOF file won't
load back into Redis the next time it starts up.  It is better to
discard the short write than waste time running redis-check-aof.
Use correct variable name for value to convert.

Note by @antirez: this code was never compiled because utils.c lacked the
float.h include, so we never noticed this variable was mispelled in the
past.

This should provide a noticeable speed boost when saving certain types
of databases with many sorted sets inside.
Redis 2.5.12 (2.6 RC6).
Fix version numbers
Merge remote-tracking branch 'antirez/2.6' into 2.6
Fixes #3 - Add arg back if port is not defined after --server
Fixes #6 - Added workaround for non-shell globbed local shortcuts
Fixes #5 - fixed ignorePaths (doesn't fix this issue, it's different)
Fixes #7 added documentation for the main tag
Version Bump
Doc Build
Bumped to yui@3.7.1
Version Bump
Versions
Docs
Update Imodec Bannner
resume
wlg
tech
Merge branch 'master' of github.com:z211/softz
pop up profiles, tweaks, user selection

added pop up profiles whne you click a name, images have rounded corners
now, user selection ui elements are there but the code behind still has
to be done.
add a section about build tags
some code cleanup and a test to add some stuff
unfollow & unfollower
[#35166765] Examples: Helferschirm / Inventur und Toni-Ankünfte
Merge branch 'next' of github.com:zhdk/leihs into next
[FIX CI] Scenario: Upload an image file for another user to see
Merge branch 'next' of github.com:zhdk/madek into next
[Finish #32528017] outsourcing the mediaResourceCollection logic to a corresponding js model and wrapping all widgets around it, which are relying on that functionality like: set-widget, permissions lightbog, highlight lightbox, import(edit)
Merge branch 'bugfix_32528017' into next due to MAdeK_feature_branches #680 and MAdeK_slow #121
Buttons in action bar are now centered.
remove grid here it is already provided
DarkGrey text color for thumbnails
Admin: media_set title is not sortable
blocking state of filter panel
miniature popup always have a background
Update lib.lua

222
Updated broodjes script.
Making attachments in email_confirm open in blank
Version 0.2.0
TU
Show login link. Issue #89
Fix get involved modal box not being shown
Improve performance by removing unneeded css files and loading jQuery from Google CDN
Remove some emtpy lines and trailing whitespace
Clean up script.js file
Show search box. Closes #89.

If you think that I should have used "the Drupal way" to implement this,
take a look at http://drupal.org/node/154137. If you still think so,
feel free to implement it yourself.
Sockets module should compile again on Windows. Fixed asyncio not compiling.
Add Bresenham (still buggy)
bcfg2-admin: Switch to pseudo file monitor
Added unique features of Socks to README.
updated composer constraints to be less restrictive
Add wrapper for QObject::findChildren in JavascriptModule
- Fixed: Image for delete icon on log page was incorrect.
OTC-38
- Fixed some typos
- Completed some DocBlocks
Added mising download icon for menu
Added download folder to data.
Moved download folder from root to folder "data".
OTC-38
Removed debug line
OTC-38 - Quality Assurance
- Added directory exists check to Msd_Vcs::getAvailableAdapter()
OTC-18 - Commit to SVN
- _Fixed:_ The prefixes for VCS modules were incorrect.
Bug fix:
- fixed url of download links
- Security: detect manipulation of filename and die silently
Added XML files for testing in CI platform
Added build script for ant
Added Zend standard config file
Fixed basedir in build script
OTC-38
Code-QA
OTC-38
Code-QA
OTC-38
Code-QA :)
OTC-38
Code-QA 2nd try :)
Try to fix paths for PHPUnit CodeCovarage.
Reverted last changes.
Prepared integration of unit tests
Fixed test set up
added phpunit.xml to be able to call phpunit in folder test on cli without giving arguments
Added functionality and did more tests which most likely resulted in a more stable system.
fix 5
change queue
fix 6
disabled some debug output
Prevent internal classes from being marked dllimport
Fix a value defined at the wrong place
more cleanup
Merge remote branch 'ace/win-fix'
Fix for segfault when doing 'coc "seyda neen"'.

This is a fix for segfault:

==8683== Process terminating with default action of signal 11 (SIGSEGV)
==8683==  Access not within mapped region at address 0x0
==8683==    at 0x59DFE4: MWRender::Animation::handleShapes(std::vector<Nif::NiTriShapeCopy, std::allocator<Nif::NiTriShapeCopy> >*, Ogre::Entity*, Ogre::SkeletonInstance*) (animation.cpp:503)
==8683==    by 0x5A4ECE: MWRender::Actors::update(float) (actors.cpp:134)
==8683==    by 0x5937A9: MWRender::RenderingManager::update(float) (renderingmanager.cpp:168)
==8683==    by 0x629AD6: MWWorld::World::update(float) (world.cpp:705)
==8683==    by 0x68B022: OMW::Engine::frameRenderingQueued(Ogre::FrameEvent const&) (engine.cpp:157)
==8683==    by 0x51F9574: Ogre::Root::_fireFrameRenderingQueued(Ogre::FrameEvent&) (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F964F: Ogre::Root::_fireFrameRenderingQueued() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F9681: Ogre::Root::_updateAllRenderTargets() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F98CF: Ogre::Root::renderOneFrame() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F990C: Ogre::Root::startRendering() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x68A669: OMW::Engine::go() (engine.cpp:408)
==8683==    by 0x51CECB: main (main.cpp:254)
==8683==  If you believe this happened as a result of a stack
==8683==  overflow in your program's main thread (unlikely but
==8683==  possible), you can try to increase the size of the
==8683==  main thread stack using the --main-stacksize= flag.
==8683==  The main thread stack size used in this run was 8388608.

when doing 'coc "seyda neen"' when animations are enabled
(Animation::animate member variable is set to 1).
Merge remote branch 'lgro/master'
Merge remote branch 'scrawl/occlusionquery'
Changed wrong instruction name enablerestmenu to enablerest, fixed copy paste error with wrong opcode for enablelevelupmenu, better code formatting
Merge remote-tracking branch 'upstream/master' into cleanups
Fixed Color.yellow. It rounded to integer values and returned the same RGBA as Color.red.
Merge branch 'master' of https://github.com/Elideb/FFWD
Azcik daha duzenleme + maps

Diki umarim isini  bozmadim, comment out bi kisim
* deleting source before closing the game - can't fix a potential MAC-problem (AL lib: FreeContext: (0x7ff37b60f320) Deleting 64 Source(s)
AL lib: FreeDevice: (0x114ceb000) Deleting 7 Buffer(s))
some code for the visitor upload feature. See also feature request #44 and pull #78
Update README.md
Update README.md
corrected chapter declaration with regard to function tyes
Merge branch 'master' of https://github.com/Frege/frege
corrected Makefile for linux
solved issue#9
Merge branch 'master' of https://github.com/Frege/frege
emergency fix for issue#16
Proper Category typeclass + Kleisli arrow
Merge branch 'master' of https://github.com/Frege/frege
Forgot to push Kleisli arrow
Merge branch 'master' of https://github.com/Frege/frege into monad-trans
recompiled assets (for css change)
Cleanup gerry's more development stuff (saved on gerry_dev branch now)
At least warn when we don't find the rr key
merged with my stashed changes (rule_class_ids update)
Fixed issue with rule_class_id lookup, tests passing again
Merge remote branch 'ethan/develop' into develop
merging forward, Ethan's Session fixes and some read rule updates
merge
Merge branch 'obj_render' into gerry_dev
cleanup of minor migration / new_forms issues
fixed to_show and help_text
cleaned assets
recompiled assets
merge develop into id_cache
Merge remote branch 'ethan/develop' into develop
Merge remote branch 'ethan/develop' into develop
Merge branch 'develop' into traits
a start
Merge branch 'reference_types' into action_events
...
...
mostly working
Pretty much all working, a few details, tests to move, coverage to extend
Move test/unit/card/* to specs
ATP
adding back more tests, including the now fixed subdivision test
more the specs more where they should be
Merge branch 'reference_types' into action_events
Merge action_events
Merge branch 'id_cache' into setting_groups
Moved trait* fetches to fetch and renamed (reduced to fetch_trait for many cases)
Fix some quality flaws
Fix MyBatis AuthorMapper for Oracle
Use new sonar-squid-java-plugin

This plugin was rewritten to use SSLR instead of Checkstyle to parse
Java source code.
add method removePolylines and alias cleanRoute
readme.md updated to 0.1.12.5
Merge pull request #54 from otakurzo/master

add method removePolylines and alias cleanRoute
add some assertion about numbers
Changed example to accommodate bounds
potential off by one errors documented
recursive minimum split
Trying to get my death code to work properly.
Practica 6
Segundo cambio Practica 6
Tercer cambio Practica 6
Cuarto cambio Practica 6
Cuarto cambio Practica 6
Quinto cambio Practica 6
Sexto cambio Practica 6
Septimo cambio Practica 6
Octavo cambio Practica 6
Noveno cambio Practica 6
Decimo cambio Practica 6
Undecimo cambio Practica 6
accepting characters only as selectors for add_* methods.
Updated the error message of AopTriggeredJoinPoint->setArguments while trying to add a non array
PERF: couple of performance improvements useful for mesh processing

 * In MapContainer::GetElementIfIndexExists avoid making 2 consecutives find
(std::map<>::count and std::map<>::find),
 * Several performance improvements in QuadEdgeMeshPolygonCell, QuadEdgeMesh
(e.g. caching the "end" iterator).

Change-Id: I9eaaf1460ddfc8d27d7083d909a5cba38388fe8f
COMP: Macro definition of None in X11 breaks enum

None is defined in /usr/include/X11/X.h. On some platforms this
results in a compilaton error because None is used in an enum. This
patch replaces the None designation with a more meaningful enumeration
for specifying an UnknownTransformCategory.

Change-Id: I82afc34a3137660edc72fa15d118fef0d93e7d23
Merge topic 'Perf_MeshProc'

28d6230 PERF: couple of performance improvements useful for mesh processing
Merge topic 'MacroDefinitionConfoundsEnum'

63b1a7d COMP: Macro definition of None in X11 breaks enum
ENH: Add "WithOnlyIndex" iterators.

Adding several new image iterators that do not access image data,
and thus can be used with type ImageBase. The motivation is to
be able to use ImageBase to store virtual domain information in
the v4 metrics. They require iterating over the virtual domain,
and thus need iterators that can work with ImageBase.

Also, improved itkImageIteratorWithIndexTest to properly return
false when it fails, and to test a little more thoroughly.

Change-Id: Ic13b7d0850398f27df298ba3174beb1fbb136d98
ENH: Adding exponential transforms.

First attempt at designing exponential transforms
to be used with ITKv4 registration.  The
ExponentialTransform class implements the standard
Gaussian smoothing for a diff. demons like algorithm
(with arbitrary metric).  The B-spline version uses
a B-spline smoothing operation to give a different
transform type but still using the exponentiation
operation on the velocity field.

Change-Id: I7e0c4829a73b551175c05f32578ba641bedc5bef
Merge topic 'ExpTransforms'

2a5dfa5 ENH: Adding exponential transforms.
BUG: GPU tests sometimes fails

GPUGradientAnisotropicDiffusionImageFilterTest2D was failing on a
certain Mac OS X 10.7.2 and 10.7.4 configuration even though the 3D
version passed there and the 2D version passed on the same hardware
with OS X 10.6.8.  After much effort, it was determined that this
patch fixes the problem.  It had been documented that Apple OpenCL
implementations weren't handling nested if statements like if(A && B
&& C), but in this case, the implementation wasn't working for if (A
&& B).  Breaking into two individual statements seems to work, but it
is not clear whether other compound if statements are affected.  Right
now, they seem to be working.

However, this compound if statement could be the issue for
GPUMeanImageFilterTest3D which is failing on other Mac
configurations.  Therefore, this patch cleans up those compound if
statements as well.  The GPUMeanImageFilterTest has also been modified
to output the result images in case this patch does not fix the problem.

Change-Id: Ia13343bc557b77b53abfb3da4a091d11d87a34a1
Merge topic 'GPUMeanImageFilterBug'

a0c39bf BUG: GPU tests sometimes fails
Merge topic 'WithOnlyIndexIterators'

8703c0a ENH: Add "WithOnlyIndex" iterators.
vtkCompositeDataPipeline: Remove redundant code

Remove methods that became obselete/redundant after the temporal
pipeline clean up  (be247f1d7658b6625652d).

Change-Id: I6e07820f4e9a150d2777d7a31aca57e6fc3200a4
Merge topic 'cleanup-CompositeDataPipeline' into master

93a8aa12 vtkCompositeDataPipeline: Remove redundant code