labofsahil/github-event-dataset-2012 huggingface dataset:
change booth config file to /etc/booth/booth.conf
Merge remote branch 'upstream/master'

Conflicts:
	src/booth.h
Merge remote branch 'upstream/master'
Add "--force" option when calling crm_ticket command

Since pacemaker has changed the implementation of crm_ticket
command, so we need to add the "--force" option here.

Signed-off-by: Jiaju Zhang <jjzhang@suse.de>
Fix github issue #13 - compile should not fail when help2man is installed.

See also: https://bugzilla.novell.com/show_bug.cgi?id=753276
Improve error reporting (bnc#749798)
Enhance the ticket information catch-up from other sites

Signed-off-by: Jiaju Zhang <jjzhang@suse.de>
Notify pacemaker about the ticket status after catching up

Signed-off-by: Jiaju Zhang <jjzhang@suse.de>
Add missing header file "time.h"

Signed-off-by: Dongmao Zhang <dmzhang@suse.com>
Add a timeout on TCP connect

Signed-off-by: Dongmao Zhang <dmzhang@suse.com>
Invoke the new crm_ticket command in pacemaker

Signed-off-by: Jiaju Zhang <jjzhang@suse.de>
Use strerror(3) in more places
Add messages warning of expected errors in test output.
Add some debug messages during ticket_catchup()
Refactor code duplication between do_grant() and do_revoke()
Fix tests to deal with addition of ticket_catchup() to setup() phase (f16e6d1a)

Now boothd site/arbitrator will hang in setup phase while attempting to connect
to an unreachable peer during ticket_catchup().  In a test environment we don't
have any reachable peers.  Fortunately, we can still successfully launch a
daemon by only listing our own IP in the config file.  But now our tests now
have to explicitly say whether they expect the server to successfully start up
via a new expect_daemon argument to ServerTestEnvironment.run_booth().
Merge remote branch 'upstream/master'
add booth icon for future use
Fixed User/post.cshtml error when running on Windows.
Properly handle unicode
Added a mechanism to print out the hints used for an active pnetcdf file, if the PISM_ECHO_HINTS environment variable is set
zuykov update
test version. wklm by Z-gamma integral.
Merge branch 'master' of git://github.com/tnason/CS1567
add cell state and begin handling all possible state transitions
update
move to doing simpler distance error calculations and theta desired calculations
... stupid mistake, fix it
update constants
update project...
add calls for setOpenings to map
we need a definition... hah
changes for map setOpenings... still doesn't work\!
Correzioni minori legate a problemi di layout.
Make issue numbers in the spec match those in the tracker.
slightly better debug
Added the dictionary

Now can create the hash table with the dictionary.  Work done on
separate thread.
add new library and fixed any bugs
working on matching coefficients
working on matching coefficients
Improve 'formatoptions'

References #10.
modified:   trizen
correction.c:41:20
Added minimal opengles patch to run
- Added control code from pickle
- Fixed a bug in pickle control code
- Added optimisation flags to VM compilation
Update configure.in per autoscan
fixed notices and warnings
lavfi/WIP: EBU R.128 scanner.

TODO:
 - LRA (3342)
 - Integrated loudness
 - better video output (more info: units, texts values, ...)
 - implement start/stop/reset through filter command injection
 - support other frequencies to avoid resampling
 - doc
 - lavfi minor bump
 - Changelog
svq3: cosmetics: Drop useless parentheses
fate: adpcm: Add dependencies
fate: adpcm: cosmetics: Sort test entries

This also places tests of related formats together.
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: adpcm: cosmetics: Sort test entries
  fate: adpcm: Add dependencies
  svq3: cosmetics: Drop useless parentheses

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/WIP: edgedetect filter
Revert changes to ScoobiApp trait (52b99298).

The commit being reverted introduced a depenency on specs2 in ScoobiApp.
This creates a bunch of problems around publishing of Scoobi and
packaging of Scoobi applications (see also issue #89).
Skip unhandled code completion proposals

Works around issue #62 so that code completion does not silently fail.
Fix test case.
Use here document.
Support shared-context & include-context.
switched to using the cites_listed flag for filtering non listed species
added a cites_listed_children flag to be able to filter higher taxa that should show up in the taxonomic view
add and operation for NFA
add or and circle operation
Added BugrapUI and modified pom to use latest Vaadin 7 snapshot as well as vaadin-cdi
Merge branch 'master' of https://github.com/vaadin/bugrap

Conflicts:
	.gitignore
	bugrap-ddd/src/main/resources/META-INF/persistence.xml
0.8.4: Minor release. Now possible to set "field: true" to allow a property tree in the "fields" property.
Refactoring. Delete function. Tooltip.
read write should work
test: duffing: add some
Include pubnub API keys in the app variable.
Changed dependencies to include minified pubnub with socketIO.
Added hook calls to user events.
Merge remote-tracking branch 'origin/master'
Cross-correlation updates.
Add format.cc to the test instead of linking with format library to avoid link errors with MSVC.
changed filter_exp to dynamic memory
blocked monitoring on loopback
Updated documentation
updated scripts for streaming

to get the "sprop-parameter-sets" use -v in the gst-launch commands in
video_streamer.sh and copy the capabilities into video_receiver.sh to
decode the media stream.
(#15644) make sure parse_line is in scope

parse_line was not in scope earlier.
mutt: auto sign emails
muttrc: copy pbrisbin's vim bindings, add mailing list shortcuts
record more data to job record for filtering
sort
bug fix search + filtering
fised issue 1063
Norwegian update from Stein-Aksel Basma
Norwegian update from Stein-Aksel Basma
Norwegian update from Stein-Aksel Basma
Norwegian update from Stein-Aksel Basma
Norwegian update from Stein-Aksel Basma
Norwegian update from Stein-Aksel Basma
Norwegian update from Stein-Aksel Basma
German updates from Raymond Vetter
Dutch update
Use correct character set for translations and when editing files https://virtualmin.com/node/22973
Include size in API command that lists disks and partitions
Add new lines before first Match
minor error message change
fedup-cli: add uid==0 check

I'd prefer we were using polkit for this, and then only when we actually
need it (i.e. when we start modifying the bootloader config and making
dirs/links in /). But until then...

[github: fixes #2]
add --expire-cache and --cacheonly (for debugging)

We might add 'official' versions of these things later on (or make these
officially-supported) but at the moment these are quick hacks to help
with debugging.
add README.asc

Add a simple README. More will be added to this as time goes on, I'm
sure.
moved test script to new location
[iOS] Added Core Data provider with transaction method.
controllers in progress
With prunner, not all readers are selected, use the selected subreaders instead.
Merge branch 'pruner-fix'
add php-cli-tools dependency
delay the cassandra flusher reset time and avoid the pubsub content remover from doing a busy loop

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@138239 a5903396-d722-0410-b921-86c7d4935375
After fixing an issue in osgi environment this test case reports an error, but in our envirionment we don't load snappy in different class loaders. Therefore remove that test scenario.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126249 a5903396-d722-0410-b921-86c7d4935375
changed the h2 version to use parent's h2 version

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@134534 a5903396-d722-0410-b921-86c7d4935375
Changing the pom version

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@134939 a5903396-d722-0410-b921-86c7d4935375
Removing invalid popup message


git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@134941 a5903396-d722-0410-b921-86c7d4935375
Added en passe and castling to the board & pieces
Fixed a bunch of bugs with castling and refactored code
A few fixes to get MoveGeneratorTest to pass... still working on it
jltc2mtc: fix non moving case
jltc2mtc: clean up debug output
jltc2mtc: use dedicated latency callback, set own port latency
jltcdump: print port latency changes
jltcgen: empirically adjust slack
fix offset display (encoder starts w/1 cycle delay)
fix jack shutdown while encoding
use 64bit int for ms offset
use double usec for timing
O2 compiler optimization
v0.5.0
finalize changelog
bin/questletor.cc,bin/xapian-letor-update.cc,letor.cc,
letor_internal.cc,letor_internal.h: Sort out standard @file and
@brief for all letor source files.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16593 6b2f1b92-a4f3-0310-943f-de3cbe41748b
api/queryvector.h: Fix SIGBUS when clearing QueryVectors

git-svn-id: file:///home/xapian-svn/xapian/trunk@16817 6b2f1b92-a4f3-0310-943f-de3cbe41748b
v4l:vb: remove warnings about MEMORY_DMABUF

Adding DMABUF memory type causes videobuf to complain about not using it
in some switch cases. This patch removes these warnings.

Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
OMAP4460: Enable half L2 cache on 4460 ES1.0

Enabling half of L2 cache WA only applies to 4460 ES1.0

Signed-off-by: Sebastien Jan <s-jan@ti.com>

Conflicts:

	arch/arm/mach-omap2/omap4-common.c

Conflicts:

	arch/arm/mach-omap2/omap4-common.c
HACK: adding address limit to DRM's cma reservation update

Ducati and Tesla firmwares need fixed base adresses (for now).
Because DRM reserves memory before remoteproc init does, we are giving
a limit adress to avoid stealing fixed physical memory of remote
processors.

this limit adress is temporary defined in arch/arm/mach-omap2/remoteproc.c
WIP: add DCE plugin..

Conflicts:

	drivers/staging/Kconfig
	drivers/staging/Makefile
XXX more DCE.. support to properly abort a txn
UBUNTU: Config update

* K3.3
* Enable RPMSG
* Enable VIRTIO
* Config update vs 3.3.0-1481.18

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
UBUNTU: SAUCE: [arm] fixup __aeabi_uldivmod undefined build error

When building on arm we run into the following build error due to
gcc-4.6 optimizing do_div into a uldivmod call:

ERROR: "__aeabi_uldivmod" [drivers/scsi/megaraid/megaraid_sas.ko] undefined!

Inline some assembly to prevent the compiler optimization.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: version 3.3.0-1482.1

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
add vote and votecode objects 加入投票对象和 code 对象
remove obsolete fetch module 移除旧的下载模块
make the cases of URL generation more elegant 使 URL 构造的几种情况更优雅
explicitly require the "kind" argument 显式地要求传入 kind 参数
config file module reworked 改造配置文件模块
added startup mechanism
added startup mechanism
підправив форму
网络架构调整.
trying smex out
trying out ido-ubiquitous
use smex instead of extended-command for now
install smex and ido-ubiquitous if not installed, trying them out for now.
added .smex-items
skipExecution tag was added to vaiables-related tests
Reorganized source, started adding clients
Removed tests for core.clj
.gitignore now includes .lein-failures
Get USB functional on x86-64.

- Various changes to printf format specifiers to make them 32/64 safe.
- Adjustments to various descriptor structures since addr_t is not 32-bit
  on x86-64, and consequently this breaks the physical structure that's
  expected. Also adjusted padding to accomodate 32-byte boundaries when
  64-bit pointers are in use.
- Adjustments to make use of phys_addr_t where needed.
Added USB modules to image.
Add usb_hid to image and get it building/working.
First commit
コード整理
Test unit fixed.
余分な「facebook で」を削除
Cleanup and simplify genRule (not yet finished)
Been testing.
- changed printk(* for pr_*( everywhere, added newlines, and added debug messages at every error branch (I hope).
- fixed some bugs:
  * get_bib_table() was returning nothing when requested the ICMPv6 table, both in BIB and session.
  * The code used to assume skb->transport_layer was set, which was not the case.
- added a hash code function for in_addrs.
- changed %pI6 for %pI6c everywhere.
- organized the hash table unit test a bit.
bugfix
* router匹配controller之前去掉路径内的文件扩展名
+ Request->extension()，返回请求路径的文件扩展名
代码改进
Revert "代码改进"

This reverts commit f33f53867d4ee2978a428c8d4ea3bba550e5a9bf.
代码改进，把匹配逻辑拆分到不同的方法，便于重载
funcion added to RNPageSwipe
Add Encoding-convertions on utils
gen minhash
notes: simplify tests
ccwrap.py: Support proper generation of .d files
modify concurrency
Merge branch 'master' of https://github.com/youngjay/next
instruction

instruction
modify: rename Visibility::Shown to Visibility::Hidden
fix: tests for CommentsController
add: tests of commentable
git: change default push behaviour to 'upstream'
zsh: change completion format for groups
Merge branch 'textedit-profile' into dev-profile

Conflicts:
	git/gitconfig.symlink
change vim indent handling
add 'git merge --no-ff' alias
drop bash support
add archlinux alias 'pcR' to remove a package
add README
Merge branch 'textedit-profile' into dev-profile

Conflicts:
	vim/alias.conf
remove leftover debug statement
Restore ocamlbuild
Adding a .ocamlinit in src/ also
Remove ocamlfind dependency for now
1. 'Lam' now contains a '(id*ty) list' representing binders
   instead of 'ty list'.
2. Changed the 'tyctx' in unification code from 'ty list'
   to '(id*ty) list'. Now 'tyctx'(type context) has a unified
   form in unification and typing (i.e., '(id*ty) list').
3. Updated the test cases to accommodate changes above.
Update the term printer to handle naming hints
1. Change clauses from term*(term list) tuples to a term
that are quantified by forall binders.
2. The tactics still need the old form, as well as some
test cases. The 'clausify' function in tactics.ml get a
term*(term list) tuple from a clause

Issues to be solved:
1. Some test cases in prover and tactics break because
the order which subgoals are generated changed.
2. The names generated from clausify have a very large
index.
1. Clausify does not change the order of clauses
2. Clausify does not create fresh constants. This job
   has already been taken cared by the 'freshen_clause' function
'clausify' generate a triple (tyctx,head,body) from a term clause.
This 'tyctx' are built from prefix forall binders. 'freshen_clause' no
longer judges that a constant is a logical constant from the fact that
it is captialized. Instead, it checks if this constant is in 'tyctx'.

Definitions stil use the old method (check captalized ids) to check if
a constant is logical. This might be fixed later.

All test cases updated and passed.
Move type-related functions to a separate module
fixup! Move type-related functions to a separate module
WIP: formatting expressions with precedence
WIP: properly dbx'd type variables (src/poly.ml)
WIP: rethinking de bruijn indexes in poly.ml
wip
wip
wip
wip
wip
wip
Allow all classes/functions/… to be prefixed with a user-defined prefix, to work around the lack of namespaces in Objective-C, and fix all the problems that the lack of namespacing introduces
GPULog instead of NSLog, to only log in DEBUG builds
Guard against macro's being #define'd multiple times as well
merge
Avoid problems with Intel drivers when passing 0 as HDc, calls are equivalent when context is 0.

git-svn-id: https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk@4161 dfc29bdd-3216-0410-991c-e03cc46cb475
Chnage use of ResourceBundle for Properties in custom changelog.
TM merge UI change
Merge branch 'rhbz874342' into release
rhbz842191, rhbz837999 - project wide search using HQL will look for null targets
Merge branch 'release' into integration/master
eclipse format for intellij
index source contents as 1-, 2- and 3-grams with preserved and folded case
remove unused lombok imports
Removed Projects

Removed Projects, will be added future.
Implementing SYNC and TRUNCATE

Also factoring out code for finding ilist holes.
Octopress init
Site updated at 2012-10-26 15:33:27 UTC
Upgrade the pathogen
dsfasfdsfa
* common-src/glib-util.c: Do not compile ssl initialization code if
  libcurl is not linked.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4802 a8d146d6-cc15-0410-8900-af154a0219e0
* device-src/s3-device.c, device-src/s3.c: Castor require libcurl
  7.19.1.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/branches/3_3@4870 a8d146d6-cc15-0410-8900-af154a0219e0
Added styling for breakpoints
go wide!
slightly wider content area to match most media embeds (flickr, easy youtube)
use anonymous for code,pre; other minimal css changes
inconsolata doesn't have a bold face, so when i use <code> in titles, artificial bolding looks like crap.
markdownify2
a liquid filter to markdownify a singly line of text and then strip out the surrounding <p> - useful for headers, where a <p> is just not necessary
use rdiscount for markdown
Everything from tumblr.
Many of these were hand-edited so doing an update after this would... suck :/
Generate an htaccess file that I can put on blog.zpao.com to redirect those old posts
move some posts to better permalinks
`url` is already a reserved attribute for pages, so use `source_url` for link posts
add links to the source for link posts
update index page to take out that missing tumblr message
generate an index page for blog.zpao.com
clean up the feeds
* don't filter for mozilla in default feed
* make title type=html for proper handling of markdownified content
* use {{ site.url }} instead of hard coding zpao.com
* give feeds unique ids
renamed atom.xml -> default.xml
new post - lion full screen
default is to use all available cpus
add TestAddImage
难题发布
Added various plugins for python editing
RULES: Added rules
RULES: Added some rules
put box around quotes
Export 'showPackageEnvironment' from D.C.PackageEnvironment.
dumpPackageEnvironment: Create the sandbox directory if it is missing.
Refactor the initial package environment code a bit more.
Clarify that 'loadPackageEnvironment' expects an existing directory.
Rename a function.
The sandbox dir wasn't passed to 'configure'.
Comments.
Add two new fields to package environment file.

Adds two new fields: 'constraints' and 'preferences'. Example:

```
constraints: foo ==1.0,
             foo +use_blah -use_blurb

preferences: bar ==2.0, baz ==3.0
```
Add 'D.C.PackageEnvironment' to 'Other-Modules'.
Allow invoking 'hc-pkg init' via D.S.Program.HcPkg.
Add a (hidden) 'dump-pkgenv' command.

Also adds a bunch of dummy sandboxing-related commands.
Add a separate module for the sandboxing-related commands.
Actually implement the sandboxing-related commands.

Adds five new commands:

    cabal sandbox-init
    cabal sandbox-add-source
    cabal sandbox-configure
    cabal sandbox-build
    cabal sandbox-install
jscoverage: fix configure errors with clang

jscoverage-0.5.1 has a file with hardcoded gcc and g++, named
configure.gnu.  inreplace those with ENV.cc and ENV.cxx.

It also has three places in js/configure where the conftest uses

    int main {

but also has two return commands.  The first return command,

    return;

does not return a value.  The second one does `return 0;`.
This causes an error building with clang during configure
because `int main` should return a value.  inline patch those
by removing the extra return command so that it does a `return 0;`

All four of these issues have been bug reported to their tracker,
and the formula comments include a link to the bug report.  The
issues exist in HEAD.  This now builds with all the compilers in
Lion and Snow Leopard, though no runtime tests were done as this
is unfamiliar software.

This would fix #11600
Removing unneeded gems
Merge branch 'master' of github.com:2jays/buttress
#2915, #2921 und 20 weitere Rechtschreibfehler korrigiert
Merge pull request #7 from 4Vs/master

<p> eingefügt für bessere Gliederung.
Merge pull request #5 from following5/rechtschreibkorrekturen

#2915, #2921 und 20 weitere Rechtschreibkorrekturen
Update Teamliste
fix #3404: Verlinkte Grafik existiert nicht
#4356 abgeschnittene GC-Wegpunkte durch Leerzeicheneingabe
#4496 PHP 5.3: Timezone settings
#4496 PHP 5.3: Timezone settings #2
Merge pull request #19 from Metrax/master

#4496 PHP 5.3: Timezone settings
Merge pull request #14 from following5/teamliste

Update Teamliste
Merge pull request #8 from following5/3403-cacheicon-unpublished

fix #3404: Verlinkte Grafik existiert nicht
Merge pull request #16 from following5/4356-wpgc-input

#4356 abgeschnittene GC-Wegpunkte durch Leerzeicheneingabe
#4487: Funktionsdeklaration in translate.class.php
Merge pull request #21 from following5/4487-translate-t

#4487: Funktionsdeklaration in translate.class.php
Merge pull request #1 from OpencachingDeutschland/master

Noob hier - bekomme ich so mein Update?
add rel=”external”
Adjustments in order to allow the site to work with the underlying changes. Kinks still in existance.
File: Implement the stat() and fstat() system calls.
Initial Commit

Missing text data
Load Console font.

- Also add some safeguards against loading fonts before the Default Palette.
Fill in DCanvas with new text drawing functionality.

- Requires a new CONFONT lump in odamex.wad in FON1 format.
- Odamex compiles and runs, but is very unstable and prone to crashing.
- If you can get the port to stay alive more than a second, you will see all text rendered as CONFONT.
Digital board with BlueTooth.
Added mysql log
Added... I hope... a buffering display. Updated some stations to support 'Now Playing' polling.
Videos are played using a mediaelement which doesn't suffer from the WPF Airspace bug. Audio uses the standard WMP control like before for song title detection and what not.
Mysterous script command is being fired. Trying to figure out what it is.
Isolated drawing to a Drawing Engine class.
Add ConnexionManager classes
Initial Commit, Empty MVC4 Project
Add user for online reg
vga: fix bochs alignment issue

The bochs dispi interface traditionally uses port 0x1ce as 16bit index
register and port 0x1cf as 16bit data register.  The later is unaligned,
and probably for that reason the the data register was moved to 0x1d0
for non-x86 archs.

This patch makes the data register available at 0x1d0 on x86 too.  The
old x86 location is kept for compatibility reasons, so both 0x1cf and
0x1d0 can be used as data register on x86.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
vga: fix mmio vga register mapping
target-cris/translate.c: Code style clean-up

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
tcg/tcg.h: Duplicate global TCG variables in TCGContext

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
TCG: Use gen_opc_ptr from context instead of global variable.

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
TCG: Use gen_opparam_ptr from context instead of global variable.

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
TCG: Use gen_opc_buf from context instead of global variable.

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
TCG: Use gen_opparam_buf from context instead of global variable.

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
TCG: Remove unused global variables

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Merge branch 'vga.1' of git://git.kraxel.org/qemu

* 'vga.1' of git://git.kraxel.org/qemu:
  vga: fix mmio vga register mapping
  vga: fix bochs alignment issue
libseccomp: require version 1.0.0

Debian Wheezy has version 0.1.0 which is not compatible, avoid it.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
bump services for dev_setup

Change-Id: I6caddbd37e94f80b652c602a9fa56a859d0b3c43
Merge "bump services for dev_setup"
[dev_setup] generated vcap_service_backup_ctl should be in git ignore list

Change-Id: I64b44e91418249efac54a1f593cf02546393db61
Merge "[dev_setup] generated vcap_service_backup_ctl should be in git ignore list"
ajout de mws submit feedY
Bump spraycan for :cut and :copy changes
Changed license from GPL v2 -> GPL v3
BetHistories should now work

but a good solution for showing this is still needed
added first design for bethistory(but this is really ugly)
Adding skills to conversion.
Add mustard theme.
Oops! Fix typo.
license for EE2
teste
teste2 adicionado
set() for attribute
Disable perf test in debug builds to let test run pass
Added h2: Scuba Diving.
Update lab_7/reviews.xml
[Tools] Moved/renamed SafeBoolIdiom.hpp to Tools/SafeBool.hpp
add vim config stuff
Refactorisation du code et des requêtes
Removes the added logging and switches some js to camelcase

Signed-off-by: Akash Manohar J <akash@akash.im>
Merges master and solves conflicts

Signed-off-by: Akash Manohar J <akash@akash.im>
Syncs channel deletion

Signed-off-by: Akash Manohar J <akash@akash.im>
Delete create channel view

Signed-off-by: Akash Manohar J <akash@akash.im>
changes create_channel_area to camelcase

Signed-off-by: Akash Manohar J <akash@akash.im>
Some refactor

Signed-off-by: Akash Manohar J <akash@akash.im>
Kandan.js refactor

Signed-off-by: Akash Manohar J <akash@akash.im>
Refactors kandan.js; Turns the huge function into bits

Signed-off-by: Akash Manohar J <akash@akash.im>
rm de SwipWorkflow et NlToPivotRules-
Passage de NlToPivot en REST
Passage de PivotToMappings en REST
Passage de SwipWebClient en REST
mc/classic: Fix some spelling

Signed-off-by: Astelyn <astelyn@live.com>
Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
Zamiana peekLast na getLast (zgodność z starszymi androidami).
minor fix and improvement
improved latest activities rendering. now using knockout.js
1.1.6f changes
#18 creation du fichier php (initialement vide) pour la page listant les cours suivant une UE selectionnee
#18 modification du navigateur pour la nouvelle page cree
#18 ajout de la page dans la liste des pages AdminPromo
Initial commit, version 2.0.5
fix
Alter database.php.default to meet our needs
Add basic home.ctp
Update to v2.1.3
Fix database.php to work on PHP Fog
Debug level needs to at least be "1"
Setup lejo.phpfogapp.com
Initialisation du site
Correction docType
Correction docType
Push GitHub
Merge branch 'master' of git@github.com:Crook93/dev_jo.git
Final

Signed-off-by: CyberZHG <443442708@qq.com>
沪深300进入数据库~其实是加了个输出。

Signed-off-by: CyberZHG <443442708@qq.com>
Added preferences flag only_favorite_folders

If enabled, only folders marked as 'favorite' will be regarded.
Add shared core
Merge branch 'master' of https://github.com/DAlOG/Morpheus
Minor improvements
Removed value from Piece. Should be in AI's not Board
Change ordering of Piece methods to be more logical
Optimisations of AIs and print_moves
Made slightly prettier with list unpacking
Core/Paladin: Fixed Beacon of Light
It now correctly shows the heal amount to the Healer
Added GET_FARPTR and SET_FARPTR, simplifying code doing FARPTR access and enabling the use of VariableData::address as an offset like for MT_POINTER.
That's far pointer, not long pointer. Deal with it.
moving from color to jquery ui
Vorige was helemaal fout gegaan, hopelijk nu wel goed.
remove sdl_test_main
Merge pull request #14 from take-cheeze/master

another update
fixing some little problems in NetBSD
.emacs: Basic Settings
.emacs: Update Basic Settings
Add recentf-init.el
Update .emacs for recentf
.emacs: Fixed Path Error
Add Auto-Complete-1.3.1
Auto-Complete Path
Add yasnippet
Update yasnippet
Update Auto-Complete
Remove auto-complete-init.el
Add origin auto-complete-init.el
Add util.el
Add Buffer Settings
.emacs: Add Buffer Settings
Add icomplete
Update yasnippet
Bind C-n & C-p to auto-complete
Update AC
Update AC
Small review
Merge branch 'master' of github.com:Extj/GuestBook

Conflicts:
	js/ajax.send-comment-form.js
	protected/models/Comment.php
Merge branch 'master' of github.com:Extj/GuestBook

Conflicts:
	js/ajax.send-comment-form.js
	protected/models/Comment.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/ajax.send-comment-form.js
	protected/models/Comment.php
Last review &
Merge branch 'master' of github.com:Extj/GuestBook

Conflicts:
	js/ajax.send-comment-form.js
	protected/models/Comment.php
Implemented basic iterators
Fix: Suppr. de l'option pour cacher le bouton Repondre
VERSION: 1.6.0.1
fix en login/logoout de FB + ie8
ActionBar implementer, men ingen knapper fungerer foreløpig
Renamed app to CountryChanger from MainActivity and added two buttons to
the actionBar. Previous and next. No functionality on them yet.
Custom listview layout added to the countrylist
copy original edge attributes to cloned edges
Merge branch 'master' of https://ToXeR@github.com/Flos/graph-php.git
Mostly finished the mod editor.
Added caching function
tried to fix more buttons, but something has happened on my laptop
added a new javaclass checkinactivity
link-relink
rm is not working, disabled temporarily
Added Engines to Package.json
BAM-82 Moving dependency management to root pom and using jbossas pom
bg e pugmi logo
pugmi logo
Merge pull request #2 from aleinside/gh-pages

bg e pugmi logo
Nothing to say
Test
Test
Update Readme with lie.
Control block mostly done
removed README.md~
Merge branch 'master' of github.com:Gurz/Hello-Git
fixed isolation lower limit > -> >=
electron sync
proper true particle output
Merge branch 'master' of git://github.com/HEP-KBFI/stpol
Merge branch 'master' of github.com:HEP-KBFI/stpol into sync535
added unfolding using RooUnfold
Merge branch 'master' of github.com:HEP-KBFI/stpol into sync535
Merge branch 'sync535' of github.com:HEP-KBFI/stpol into sync535
fixed tags
file_model, tag_model, question_model added
user_model updated
Changes

Colors changed to better variety
App icon in the picker and in the path
App images added
Initial Commit

We have a working CLI, and WordHash is clean.

Frame should probably be mergd into MainGUI.
Added missing exception message to exception log
Fixed bug where the exceptions log wasn't reset when starting a new test
Improved calculation of response time percentiles
Fixed issue where urls that had no successful requests was breaking report creation
whitespace cleanup and remove of unused import
__iadd__ must return self
Merge pull request #36 from jukart/addfix

iadd should return self, unused import and whitespace cleanup
Cleaned up some comments and unused imports
Fixed error handling while calculating percentiles more proper.
Added Vagrant example.
Merge branch 'master' into distribution-chart
moved percentile function and other logic into chart module to fix issues from merging with main branch
Forms: prevent casting error
Merge pull request #887 from HosipLan/feature/fix-controls

Forms: prevent casting error
Debugger: if possible, fetch stack trace of fatal error from xdebug
Debugger: fixed tests
Update Nette/Diagnostics/templates/bluescreen.phtml

Debugger bluescreen: caused is not wrapped anymore
Debug bar: Fixed height of UserPanel tab
Configurator: use static instead of self
Merge pull request #890 from enumag/patch-4

Debugger bluescreen: caused is not wrapped anymore
Merge pull request #891 from enumag/patch-5

Debug bar: Fixed height of UserPanel tab
Merge pull request #892 from enumag/patch-8

Configurator: use static instead of self
Forms: hash of GET forms is in action
Debugger: fixed missing key 'function' in stack of fatal error [Closes #898]
Debugger: fixed getAttribute('href') normalization in IE
Cache: fixed using of array_unique with non-string keys [Closes #903]
Forms: migrating netteForms.js to jQuery

All events are handled on body element
and no calling of Nette.initForm() is neccesary anymore.
Pushing a current log. Log has a lot of new entries for HumMod physiology changes.
one change for js
ISSS block menu styling
Downgrade Redirect module (by installing to International) to redirect-7.x-1.0-beta4 to see if it solves an infinite loop issue.
Merge branch 'refs/heads/master' into test
faculty/staff directory active-trail tweaks for sidebar-first menu
body bg testing
Update question box issues
SaE
Fixed some "Semantic issues"
Basic binding working.
improve property browser
Comment cleanup in db classes.
Merge branch 'master' of https://github.com/KVHC/adrumdrum
Connection string and fields no longer need to be passed to constructor
removed title functionality (to be restored later),
Removed Thumbs.db
Readded title support, modified CSS
If the mouse out event was not fired instead of just centering the lens the zoom is now deactivated.
Update teddybar.js
[Resolver] Fixed concurrency problem regarding ufcs completion
[Resolver] Concurrency fixes + thread count limiting which increases performance
[Resolver] Concurrency fixes + thread count limiting which increases performance
[Resolver] UFCS Speedup
Changed Author from xxx to Scuderi Giovanni Luca 
Fixed a setDone issue ( was set to true ... but it must loop )
Added update event in private: 
when start animation, an event is created
when stop, the event is stopped ( so it kill itself )
Create dialog help topics
Exception also for Buzzstmt::run()
Breadth first search finished.  Building paths finished.  Need to test and assemble.
Fixes bug 786605 - Accept short values for report_type parameter.
Merge pull request #805 from AdrianGaudebert/786605-crashes-daily-report-type

Fixes bug 786605 - Accept short values for report_type parameter.
Added git config for push
Modified calcFitness() to run about twice as fast.
Changed design for conversion functions:
− always return the number of code units written;
− character conversions take a pointer to the string pointer and advance it.
- Prima parvenza di scheduler (funzionante per più processori) scritta
Agregue sigmoideaPrima
Merge branch 'master' of github.com:Marian0/ICFich
mejore un poco las oscilaciones gracias al sismografo de Ritcher
Merge branch 'master' of github.com:Marian0/ICFich
colorcolumn, taglist, tabs config

Signed-off-by: Martin Richard <martius@martiusweb.net>
add start-tiling: an ocaml script to start up
add lua
Add related procmail file
Gitignore
FireNetCMS - some fix
Added few unhandled opcodes
IndexAPI 开始，加入题目
Added DELETE and PUT support to the Http networking library
Added GPL 2.0 License.
Improved track titles detection
added herke to aliases
no longer using mc using ranger now
Merge branch 'master' of github.com:Mytho/dotfiles

Conflicts:
	.config/mc/ini
New admin pannel from Travian 3.6
Gradle Release Plugin - pre tag commit:  '1.1.8'.
Removing keyboard events, we are not going to support them.
Try-catched methods of the figurefactory so we get more error messages in the logger, but not crashing our service in the process.
Check again, the violationDTOs are not saved in the decorator. It's only used for getting the highest severity color. If they would be passed in order we could just do violationDTOs[0].severityColor and prevent a loop.
rss.
Added support for MouseEvents
Fixing halo exchange errors in mpi+cuda due to soa
Removing soa direct access constraint
add search query to search redirect
Fix wrong path calculation for deployment file in restore action for VMware
Add tmpdir configuration parameter to servers
Update src/com/optifyTest/Keywords.java
Refactor draw hs
Correction Bug 3
Bugfix deprecated PHP5.4 (Perl-style comments)
Added HTTPS support to BASE_URL constant
Added HTTPS support to BASE_URL define
ajuste na main, e tira sleep desnecessário do método visit
removed PINT namespacing check
update address param
Enabled positional audio (bad quality, without HRTFs in version < 1.14)
Added assert_byte(), assert_word() & assert_between() to control that values don't overflow their expected value boundaries.
Added DEBUG and NDEBUG macros to build configurations for the assertions to work.
Added memory read lookup functions.
Make __history__.html not empty, in case that's confusing gh pages.
migrate main loop function call from clone to pthread
migrate main IPC event loop function call from clone to pthread
migrate last clone call(needed to properly handle incoming SMS messages) to pthread
bash default shell
Rest of the functions accessed from main class
More mass package renaming
Corrected Script class to handle int costants and evaluate some non standard Txs like
3a5e0977cc64e601490a761d83a4ea5be3cd03b0ffb73f5fe8be6507539be76c
0f24294a1d23efbb49c1765cf443fba7930702752aba6d765870082fe4f13cae
Implemented edit_box, refactored edit_line. Fixed edit_line border issue.
Try to implement`class ShoesLayout < Swt::Widgets::Layout` and port `contents_alignment` and `positioning` methods from Purple Shoes. The `samples/test1.rb` is an example snippet to confirm Shoes Slots (Stack/Flow) behavior. Try out `bin/swt-shoooes samples/test1.rb`, please.
removed explicit email option in hopes of making the 'send email to all public members of organization' stuff working
No worry, I made this spec fail on purpose in order to test the email notifications of travis-ci. I'll revert in a second. Instead if you just got an email, feel happy because apparently it worked.
It worked :-) so: Revert "No worry, I made this spec fail on purpose in order to test the email notifications of travis-ci. I'll revert in a second. Instead if you just got an email, feel happy because apparently it worked."

This reverts commit 04edfbb7fa224c5aedcb3fee706a1fdeab95a1f8.
Add hard-coded email notification since auto-magic github integration doesnt' work (see Travis-CI #634 https://github.com/travis-ci/travis-ci/issues/634)
Fixed a bug found by Eric. Just changed the order of calling methods. Refer to https://github.com/shoes/shoes4/issues/84#issuecomment-7050663
Modified specs for the commits: 50b675b355d0b557f634141a5a9a739aff5e3be1 and 004dee6bc28b6ed364f5d786c344fa4df86629cb
Merge pull request #92 from ashbb/sandbox3

Start point of implementing hand-crafted layout manager
Revised line, oval and Shape methods. Try out the following snippet.

Shoes.app do
  fill green
  stroke red
  strokewidth 10
  oval 100, 100, 100
  line 50, 50, 300, 300
  fill purple
  stroke blue
  shape do
    move_to 200, 50
    line_to 300, 100
    line_to 250, 350
  end
end
Enable oval elements to use alpha level.
Try to implement move method for oval element. Try out this snippet:

Shoes.app do
  o = oval 0, 0, 50
  animate{|i| o.move i, i}
end
A solution for flickering problem on Windows.
Merge pull request #96 from ashbb/sandbox4

move method for oval element
basic image implementation
Fixed a bug. Now it's available to execute a block when the button is clicked. This is a tiny test snippet:

Shoes.app do
  b = button 'button' do
    p 'hello'
  end
end
Remove Shoes::Color#rgb method. Refer to #93
Fixed a bug. Now corrected the size of top_slot. This is a test snippet. Before this commit, it showed `[616m 538]` on Windows.

Shoes.app do
  p [width, height]
  button 'click' do
    p [width, height]
  end
end
Revised background method. This is a test snippet:

Shoes.app do
  background green, curve: 30
end
Fixed check and refactored button
Adding FOSUserBundle routes
Adding FOSUserBundle's main firewall
Changing Eirin's route prefix
Creating options action (Eirin:Vote)
Creating the options route (Eirin)
Creating the vote route (Eirin)
Creating options saving route (Eirin)
Setting the method requirement in saveOptions (Eirin)
Begin working on saveOptions (Eirin:Vote)
added gemfile dependencies and fix for chef-client install
Print the usage if no arguments are specified
Add a .gitignore file
Add information that the file is in utf-8
Trailing spaces/tabs and little bit of formating
Some cleaning

- Insert the folder above so that the scripts works in a checkout of the sources
- Remove trailing slash
Merge branch 'dev' of https://github.com/pypingou/pyrdfa3
Some beautifying coming from a github contributor (pypingou) (should have been done before the 3.3 release but, oh well…)
finished event
finish in docs
0.1.1
comentar
rebeca
added component validation
Update: take this medkit
compatibilidad con IE 8
Merge branch 'master' of github.com:SIGMA-IT/login
modifs desktop
j'ai fait mumuse avec angular+css pour le desktop.
Merge branch 'master' of github.com:SNAP-NF28/SNAP
Small typo fixed
Merge pull request #23 from strategit/patch-1

Small typo fixed
Merge remote-tracking branch 'upstream/master'
-renomme fichier test option.c en testfile
-deplace main du fichier options.c vers main.c
-cree Makefile
Bug fix in studentGrowthPlot
studentGrowthPlot bug fix
Merge pull request #294 from dbetebenner/master

Minor bug fixes to student growth plots
Update units evacuated immediately in Allies 03
Slightly different mouse script (not enabled by default) -- needs more spiffing out.
Finished the file API completely - can now work on the KL.
Fix handlers.slice being undefined.
Fix #389: Vendor TodoMVC example for Alfred instead of old crappy one.
Fix command line tests.
merge
image shrink size
Merge branch 'master' of https://github.com/ShuoLi/blanket
improvements to daily dev awards scripts

make scripts/{top,devapps} into modules.
add an awards script that controls both and can send output to a file.
don't overwrite file in awards.js
normalized the name to what we use elsewhere already, doh
Some renaming locker->hallway
Fix the bindings with mysql pure
Merge pull request #699 from Singly/mysql-pure

Fix the bindings with mysql pure
need to ignore objects, only process url strings
Post status (text) to Tumblr

This introduces the `title` parameter, which we can use whenever there's a
matching text field. The list of params getting passed over from `lib/posting`
is getting sort of long and could use some kind of rethinking or magic.

I went to `request` instead of using `tumblr_client` because photo posting will
probably need a custom touch.
Post photos to Tumblr

The Tumblr API is crazy and this is the only library I can find that manages to
upload a photo. It does it with a bunch of crazy regex substitutions during
OAuth, which are frightening but appear to work.

Something really weird is still happening, and we can't send captions along with
photos, so for now I just ignore any body included with the upload. I also don't
know what effect trying to include Tumblr-specific parameters might have.
Post links to Tumblr

Mostly like text, but with a URL.
Merge pull request #481 from Singly/tumblr-posting

Post to Tumblr
framework to start indexing base friend parallels
removing stuff
add github banner
add: Set 'dist' var
add: default vers
fix: version parsing
Properly load Textures when requested by a material
Fixed the NPEs ocurring in the last build. Now registers entities
correctly for resolve.

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Fix more hardcoded paths &#3232;\_&#3232;
Should attempt to close files if there is no access - though probably would be some every 30 seconds
Added last tick tasks that occur one shapshot copy before the main thread ends
Improved shutdown sequence ordering - wasn't the problem though
Root cause: world level itemMaps need to be saved whenever you save a chunk, since that is the only time they update
Little fix in worldRenderer

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Merge pull request #2106 from L5D/work

Little fix in worldRenderer
Early physics
attach parent immediately, fire onAttached later
Added cropping to pdftohtml
added in line images
Fixed warning in addChar.  Copied code from TextOutputDev.
Added Deg and Micro symbols
added operators and added new flag isBinary on +/-
this is rays file
Removed line that output hex values with spaces (AA BB CC DD ...).
switch aosp repos to refs/tags/android-4.2.1_r1
Organized libs & uncaught exception handler
fix #5271
testineenmap
new deploy settings for stanalone passenger
..F....... [ZBX-4764] fixed critical error in Administration->Notifications

git-svn-id: svn://svn.zabbix.com/trunk@26150 97f52cf1-0a1b-0410-bd0e-c28be96e8082
..F....... [ZBX-4736] fixed undefined variable in Inventory Hosts

git-svn-id: svn://svn.zabbix.com/trunk@26153 97f52cf1-0a1b-0410-bd0e-c28be96e8082
..F....... [ZBXNEXT-397] removed wrongly added files

git-svn-id: svn://svn.zabbix.com/trunk@26158 97f52cf1-0a1b-0410-bd0e-c28be96e8082
.D........ [ZBX-954] changelog entries start with lowercase

git-svn-id: svn://svn.zabbix.com/trunk@26167 97f52cf1-0a1b-0410-bd0e-c28be96e8082
..F....... [ZBX-4765] fixed filter fields being unset when saving of discovery rule fails

git-svn-id: svn://svn.zabbix.com/trunk@26180 97f52cf1-0a1b-0410-bd0e-c28be96e8082
A.F....... [ZBX-4257] fixed creating discovery rules, items and item prototypes (Pavels)

git-svn-id: svn://svn.zabbix.com/trunk@26184 97f52cf1-0a1b-0410-bd0e-c28be96e8082
New multi-response system implemented for the learning system!
Implemented new random multi-response system and fixed a bug
SDL/Font: use the bold font variant if available

Using a bold variant is much better than synthesising bold glyphs
automatically from a non-bold font file.
FreeType/Font: add missing variable
{SDL,Freetype}/Font: remove monospace fallback from Initialise()

The fallback is now present in Load().
OpenGL/Scissor: add overload with PixelRect
GlassRenderer: renderer for glass effect

Implements part of TRAC #2466.  Not used currently.
CirclingWind: use incrementing Angle variable in loop

Adding to Angle is cheaper than multiplication.
Screen/Custom/Files: Add some additional font paths.

openSUSE installs truetype fonts directly in "/usr/share/fonts/truetype/"
without any additional sub-directories.
Screen/Custom/Files: Remove non-standard font path
Merge branch 'master' of git://git.xcsoar.org/xcsoar/apf/xcsoar
I2CbaroDevice: Include cleanup
LowPassFilter: Moved API documentation to header
LowPassFilter: Inlined trivial LowPassFilter() function
OffsetButtonsWidget: use virtual method instead of std::function

Less overhead.
AirspaceList: Added missing filter options for TMZ and MATZ airspace
AirspaceSorter: Removed unused FilterByName() method

This has been obsoleted by the FilterByNamePrefix() method
Merge branch 'v6.4.x'

Conflicts:
	src/Engine/Airspace/AirspaceSorter.cpp
AirspaceSorter: Removed unused four_chars attribute
Chapter 3 stuff
Routes
Finish layout and routes
Yeah, should've added the notes.txt to git as well...
Threw an exception in case an item has no parent (such as a world).
Adding travis configuration
Updating configuration
Playing speed is now normal double
API call for setting speed
Added confserver option
centrer commentaire
The setFlex(String) API in org.zkoss.zul.LayoutRegion is deprecated, use setHflex/setVflex on child component instead.
F60-ZK-1127: Support OSGi
Add zel.osgi.jar
add dist/lib/osgi folder to ignore list
Merge pull request #24 from VincentJian/F60-ZK-1127

F60-ZK-1127: Support OSGi
Fixes polygon creation and its specs
Merge pull request #230 from YueRen/gfanlib

Gfanlib
fix: gfan interface changes
fix: syzygies for qring with ring-coeffs, part1
fix: tr 439
chg: new command igcd to compute integer gcd
fix: tr 440
Merge pull request #156 from mmklee/factory_trfix

Factory trfix (also merged into SW with 86aa4d5c1040128ae11af385a7d11c3d770d370e)
fix: error handlung for dump: close link
add: dump/getdump for ssi, implement intmat
fix: signal handling during system calls
add: decomp.lib
fix: removed --without-debug: this does not work on 64bit
Merge branch 'master' of https://github.com/Singular/Sources into gfanlib
Pop up minor update
Final Commit(+answers, counter)
Final commit
Апи для связи с Youtrack
Merge branch 'master' of github.com:ZaiSL/youboard
[TASK] Cleaned code. Implemented features.
[TASK] Cleanup.
[TASK] Changed databaselayer into being a submodule.
[TASK] Updated README (now README.md) and cleaned up code.
opacity при наведении на иконки
added tags
the hunt of a weird bug (that turned out to be in golua)
Fix InvalidOperationException when invoking non-generic methods to get arguments on ToConstructor binding.