labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge remote-tracking branch 'origin/release/rails3anddb/hadoop-os-build' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge remote-tracking branch 'origin/release/rails3anddb/hadoop-os-build' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge pull request #1300 from juddmaltin-dell/pull-req-release-rails3anddb-hadoop-os-build-209f601003

Fix class CmdbAttributes [5/5]
Merge remote-tracking branch 'origin/release/rails3anddb/hadoop-os-build' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
change /usr/bin/ruby to /usr/bin/env ruby
Merge remote-tracking branch 'origin/release/rails3anddb/hadoop-os-build' into release/rails3anddb/hadoop-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/hadoop-os-build
Merge pull request #1308 from juddmaltin-dell/pull-req-release-rails3anddb-hadoop-os-build-fdbc59a6c0

change /usr/bin/ruby to /usr/bin/env ruby [7/7]
Merge remote-tracking branch 'origin/release/rails3anddb/hadoop-os-build' into release/rails3anddb/hadoop-os-build
Update notes for submitted changes

* Fix file permissions for AWS/OpenStack agent openssh keys
Update notes for submitted changes

* Upgrade fog gem to version 1.5.0
Dev-setup for multiple redis version

Conflicts:

	dev_setup/cookbooks/redis/templates/default/redis_node.yml.erb
	dev_setup/cookbooks/redis/templates/default/redis_worker.yml.erb

Change-Id: I19d2769271c7d656acfbc0ddb13f5935a53f2b98
Merge "Dev-setup for multiple redis version"
First git commit for CloudBox
1. Add event processor
2. Add CBDialog
3. Implement CBSystemDialog
4. Implement iOS Alert Dialog.
5. Using CBDialogManager to manager alert dialog
Add CBUserDefault function.
Add iOS version check in supportedInterfaceOrientationsForWindow
check __IPHONE_6_0
Update CloudBox
Merge branch 'master' of https://github.com/cloudhsu/CloudBox
fixed #1403:support png8
Merge pull request #1124 from minggo/iss1403_png8

fixed #1403:support png8
Revert "trying to fix caching"

This reverts commit a60ca70380c75ad417045fe8d75acda96709a313.
Revert "something"

This reverts commit c12f208f9267b241a8f62c4ad237ba20ce04d2eb.
Revert "changed cache output to default. might work"

This reverts commit 7a6bfa48ab64a4cdf0bc1379386a079b461a58be.
Revert "added cache commands"

This reverts commit 2a35606f0372bedf41992f31996ffe3c0748a9f1.
Revert "added siantra/cache to bundle"

This reverts commit 3db4a096808f442f8bfae0a8693212d4a3d13b0c.
Revert "auto bundle on commit"

This reverts commit e109b94673ea5d872ffcf8e4c44100473ad1b9c7.
track CM LatinIME
What.cd preference should be titled password, not passkey, also, updating whatapi and adding authentication bugfix.
Making things run.
Dropping the gif generation and instead returning a bitmap to ruby.
chapter3 edited xib file
CS Fixes
Merge pull request #683 from ktomk/patch-4

Minor fixes while running along.
[docs] Document the notify-on-install config option
[docs] Update composer repository specification
[docs] Document COMPOSER_HOME
[docs] Aliases: branch-alias and inline aliasing
[docs] Improve description of COMPOSER_HOME
[docs] Correct default process timeout
[docs] Clarify that there is no cross-repo leakage with notify
[docs] Remove mentions of version_normalized

People will get it wrong so it would possibly cause more harm than good
[docs] Remove false information about recursive include fields
[docs] Change alias article according to comments

1.0.x-dev alias is safer than 1.0-dev. require-dev is also supported.
Clarify that inline aliases are for matching constraints of deps.
Tell users to avoid inline aliasing if possible.
Merge pull request #626 from igorw/notify-and-repo-docs

[docs] Notify, composer repository spec, COMPOSER_HOME, aliases
just added a \ before RuntimeException (sorry I didn't run the test)
Merge pull request #791 from liuggio/patch-1

just added a \ before RuntimeException
Show exact version being installed in create-project, fixes #724
Fix tests with openssl disabled
Merge remote-tracking branch 'till/svn-auth-reloaded'
Add missing license headers
Remove unused pipe argument
Svn related coding style/consistency fixes and minor improvements
Cache credentials by default since that's the default svn behavior
Support windows local paths
Make SvnDriver::supports less greedy and more realistic
Remove code duplication in Svn classes
Add note for improvement of Svn util
Fix exception handling
adding authorization/role logic to Groups#show.  closes #69
Fixed wrong params syntax closing #263
sheep stuck in ceiling
Deleting sample static page
Update submodule urls and vim-python-pep8-indent
Release 1.4.5

Also update downloads to new location.
Fixed hashing in firefox. Fixes cotag/condo_example#2
Initial import of the places app
Fix size_t error

Without this trivial change, I got the following error:
compiling SimpleString.cpp
cc1plus: warnings being treated as errors
src/CppUTest/SimpleString.cpp: In member function ‘void
SimpleString::split(const SimpleString&, SimpleStringCollection&)
const’:
src/CppUTest/SimpleString.cpp:153: error: conversion to ‘size_t’ from
‘int’ may change the sign of the result
Add TEST_SRC_FILES input.

I've found it convenient to add a TEST_SRC_FILES to list test files that
are interspersed with source, but don't need (or want) coverage output.
Merge pull request #10 from bryceschober/master

Fix size_t error and add TEST_SRC_FILES support
still working on it
stuff
Send warning message to stderr instead of stdout
Move the admin_tools templates into their proper place
Increase version to 0.1.13
Fixed issue with Chrom connecting via https, also now have HTTP Content-Type set correctly for served files
Set json path back to '/projects'
pie chart extended
test
Merge branch 'dev'

Conflicts:
	bin/classes.dex
	bin/project2.apk
	bin/resources.ap_
	src/cmput301W12/android/project/view/TakeAPhotoActivity.java
updated manifest
aweasdgasdfasdf
untracked bin files
retracking bin files
Merge branch 'master' of ssh://git@github.com/cs301w03/cs301w03.git

Conflicts:
	bin/classes.dex
	bin/project2.apk
	bin/resources.ap_
adds maps.contact data migration to people.contact
side by side figures
Sidescrolloff set to 1.

Previous option of ten turned out to be really distracting and annoying.
Make it buildable with MinGW

I just needed to fix a couple warnings, and stub out
HtmlHelp (used for tooltips).
Changing pictures page to updates page
Add missing chewing_delete() in test-bopomofo
Fix 趕人 in tsi.src
Add test cases for ShiftRight
Add test case for get_phoneSeq
Add check in sort_dic

Now sort_dic checks the following errors:

- The bopomofo in phrase is not in word (like
  50101fe213efaad10cb09beef9693e0ec63ee391).
- Length of phrase is not the same as length of bopomofo.
Increase maximum phrase size to 11
Fix several errors in tsi.src
Fix test case
Add functions for userphrase testing
Add test cases for ShiftLeft
Move global variable pItemLast to ChewingData
Splitted logic into podcast and auth_frontend apps.
some significant edits and 8 new templates
implement the creation/editting of shell commands through the shell itself ... using touch and edit ... BTW, the old edit and list commands should fade away...
nth_prime and Goldbach codes using sieve
Transition Goldbach codes to using sieve.  Great for memory, bad for speed.
Fixup segment sieve
Dynamic primes method, first pass
Changed to StateManager.create() pattern
Added router stub + onStateChange hook
reversed to fix search function
reversed to fix search function
fix typo, add restarting for reversed search
Merge branch 'search_fix'
Rename script
Add spotify status (current song) to statusbar
Group color settings
Add OSX's screenshots format change to JPG
WIP example: word classification.
fix init_bashrc.sh rm -i values
Moved the FileReader interface and IniFileReader implementation to IO
No need to scan the whole competitionpage
Correcting API limits
uploadplot.pt to handle multi-week contests
Polished version of README.md and .gitignore
activate version 0.2.1

Minor Bug Fixes:
Removed unused references to Coding4Fun toolkit.
Fixed broken animations from previous commit.
Fixed menu height.
Finished draft for reqs and tests
Added directions for native installation
Merge branch 'master' of github.com:daranguiz/contiki
Merge pull request #4 from dastbe/jstuff

Jstuff
First implementation of handling inline mail attachments.

Please add the following entry to the applications config file (value is just for example):
context.folder=/home/dave00/Dropbox/Project/gyorslevel/target/images

Images will be added to this folder during the mail fetch process.
s/problems/exercises/g
s,Add Problem,Add Test Case,
allow Problem to be selected in CourseAdminView

Still need to generate events for problem button presses.
ensure target dir exists when copying file
Update b
b completion
looks like checking the stack is the only way to make sure nobody else other than allowed players are calling set target
added win32 binaries
added C port
finished delay
didnt know u could use advanced search terms, much cleaner and better now
Actualizacion 18 Julio
Fix model association visibility.
get rid from stormphp files
libticonv, libtifiles, libticables, libticalcs, tilp: add "torture test" programs for testing how functions of the public API react to NULL parameters, and execute these torture tests in maintainer recompilation scripts.

Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>

git-svn-id: http://svn.tilp.info/repos/tilp/gfm/trunk@4438 11ccfa89-a3ba-0310-a1af-c6a367506c11
Proc file
Colorear actualizacion

Marcar de otro color los modulos actualizados
fix TOO DAMN regex
spec.md: Add mission statement and overview
todo.md: Add new tasks
Don't require RtlCaptureContext for Windows 2000 support

* added full-scale analog
Don't require TzSpecificLocalTimeToSystemTime for Windows 2000 support

* added throwing dummy
.desktop-File Versionsnummer angepasst
#57 handling routing rule limits on the server
- created shared model file (both for server and client)
- fixed compression issue when using uglify on separate files
#57 routing capabilities checked on server, based on shared data
modified:   index.apxl.gz
modified:   thumbs/st2.tiff
renamed:    vga/draw_func.h -> include/draw_func.h
modified:   include/draw_func.h
modified:   vga/draw_func.c
  void draw_str() -> void draw_str(int ox, int oy, u8 color)
  use draw_point() in draw_str().
remove draw function prototype
call draw_str(20, 100, 15); in graphic console
Loading everything from local
VBModel's cocos2dx module분리되게 tex private속성 접근안하게 변경

draw함수 오버라이딩
fix bug on git_dirty mark
Multiple Changes
Merge branch 'master' of https://github.com/dhaakon/websketch
add urllib
fix minor typo: eliminate double spaces [ci skip]
removed using dmMarkdown literally

calling dmMarkdown::brutalToText caused errors if markdown service pas
replaced. dmSeachPageDocument and dmSeoSynchronizer still used
dmMarkdown instead of replaced markdown service
parser error fix
Merge pull request #425 from jrencz/master

removed using dmMarkdown literally
make touchforms form upload csrf friendly
add bare bones api module for interacting with touchforms from code
huge speed improvement by moving from REXML to Nokogiri
nokogiri oauth fix
handle video geo update
handle video uploaded date
Fix dive trip selection for merging

When picking the "better" trip, we stupidly looked not at the trip
location, but at the _dive_ location.

Which obviously didn't actually pick the "better" trip information at
all, since it never actually looked at the trip itself.

Oops.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Associate each dive trip with the dives in that trip

We already kept a count of dives per trip in order to figure out when
there are no more dives left and the trip needs to be freed.  Now we
explicitly keep track of the list of dives associated with the trip too,
which simplifies the "find the time of the trip" logic.

We may want to sort it in time, but for now this is mainly about trying
to keep track of the divetrip relationships explicitly.  I want to move
away from the whole "use the gtk tree model to keep track of things"
approach.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Rewrite 'remove_autogen_trips()' without the gtk tree model walking

I'm trying to remove (or at least simplify) the gtk tree model usage for
our trip handling, but I'm doing it in small chunks.  The goal is to
just do all our trip handling logic explicitly using our own data
structures, and use the gtk tree model purely for showing the end
result.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Remove 'when_from_file' field from dive trip

It had become a write-only field (apart from some now useless debugging)
when simplifying the remove_autogen_trips() function.

So remove it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Clarify (and fix) dive trip auto-generation

This makes the dive trip auto-generation a separate pass from the
showing of the dive trips, which makes things much more understandable.
It simplifies the code a lot too, because it's much more natural to
generate the automatic trip data by walking the dives from oldest to
newest (while the tree model wants to walk the other way).

It gets rid of the most annoying part of using the gtk tree model for
dive trip management, but some still remains.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Drop the DB in after_script;
Fix test.basedir for new testcase
Add testcase for SF bug 3445159
Reserved fd check for fdwalk added to the callback function.
add i-yandexMetrika block
Fixed bug with slash in file name.
ldap: Working around import problems with dist-packages modules in mod_python environments
userdb: Preventing user profile password changes when the password is locked
ldap: removed debug output
Optimized drawSprite method.
Update to Flask 0.9.
Remove `get_` prefix on page functions.
Add top menu.
Implement OpenID authentication.
laundry: just displays simmons laundry now
Dunno
fix
remove relative positioning on UL
Added default editor as emacs.
api seemingly working. missing features

api can update and check links/comments. only text method implemented.
xml and json need to be done. needs to be tested more
Obstetric History Work ongoing. Still lot to do. Other history details to follow
adding appsettings functions to the menu
Use the new mysql createClient() method.
Better check if mysql is really connected by issuing a SHOW STATUS and waiting 3 sec. max (trying to fix #59)
add package smart-tab and el-get package zencoding-mode,adjust auto-complete-mode
MigrationConfig
don't need classpath in netbeans config anymore
some movement and script cleanup, still need scripts in templates though as some is dynamically generated
got new profile working on new register site
added global nav data
changing submodule paths to work with heroku
Added V.Poirier to notifications
Daniel - Adding these files
Add runtime check and StdLib table entries for pool_getcwd().

git-svn-id: http://llvm.org/svn/llvm-project/poolalloc/trunk@160007 91177308-0d34-0410-b5e6-96231b3b80d8
DSNodeEquivs: Clear NodeMap before re-using to avoid reprocessing.

When equivalencing nodes to the GlobalsGraph, clear the mappings
between each iteration so that we don't re-equivalence an
ever-growing set of mappings.

Clearly a bug, but for the curious here's some timing comparisons:
403.gcc: 93s -> 4s
400.perlbench: 25s -> 1s

Much better.

git-svn-id: http://llvm.org/svn/llvm-project/poolalloc/trunk@160178 91177308-0d34-0410-b5e6-96231b3b80d8
Update to 3.1, mostly.
Add support for ConstantDataSequential in Local.
TD: Export set of externally callable functions for client use.
Ajouté des fichiers audio de test pour la reconnaissance d'émotions et les modèles statistiques d'émotions.

Corrigé un peu de code sur l'extraction de features.
Merge branch 'master' of github.com:duckie/PartyMixer
go to version 1.7.8-SNAPSHOT

polish save as KevScript command in editor
hello world
Update golden-ratio
Fixed empty strings handling in composite caster

Closes ticket #141.
Fixed version number in NEWS file
added appropriate plugins
-Created SampleObject.c and SampleObject.h
-Moved the Integer struct and functions into SampleObject
-Eliminated the GetType pointer from interface
-Corrected the ArraySet example. Removed the NULL from the interface
constructor
-Made Integer_Compare parameters constant
-Moved the descriptions from Object.c to Object.h
-Added the Interface_Destroy function
Add a second lpg and make it blink faster
MySQLConnection geaendert.
Sourceformating
UP-2924 Run-time validation query configuration
UP-2924 Rirect Tomcat JULI logger to SLF4J
interpolation: vectorize inner resampling loop

Use vectorized types/ops for computing the 3(+1) components together.

On a dell 11z (i'm not at home), here are the results:

bilinear:
scalar: resampling:201765us
sse: resampling:101587us

bicubic:
scalar: resampling:208377us
sse: resampling:146082us

lanczos2:
scalar: resampling:201786us
sse: resampling:142049us

lanczos3:
scalar: resampling:467366us
sse: resampling:333680us
Added android folder with first version of Amusement Park App
Admin pages
Merge branch 'master' of git://github.com/isenseDev/iSENSE into HM174
-WIP commit of timfixing php code. Should fix any text-based time fields (either for all experiments or for specific EIDs).
Merge branch 'master' of github.com:isenseDev/iSENSE into kc_Issue274
neatened up files, and organized everything
Merge branch 'master' of github.com:isenseDev/iSENSE into mmcguinn-276
Merge branch 'master' of github.com:isenseDev/iSENSE into mmcguinn-276
adding many new functions
Merge branch 'kc_Issue274' of https://github.com/kcarcia/iSENSE into eg_issue274

Conflicts:
	web/ws/test/apitest-get_experiment_info.php
	web/ws/test/apitest-login.php
	web/ws/test/apitest.php
-Finished (hopefully) the time fix php script. Currently it is in dry-run mode. Next step is to add proper controls and authentication so it can exist on the line site.
Merge branch 'master' of github.com:isenseDev/iSENSE into mmcguinn-276
Working on Bug #210. Most of profile is private
Added last name filter to browse.php?type=people aka the people nav button
Added proper privatization of getFeaturedExperimentsWithPhotos()
Added a comment to all last name filters and added last name filtering to followers and following
@ccocora ... I don't even.. #TABLESARENOTFORFORMATING
That was ugly
fix bug #283 Paginates experiment.php using js. After pulling you have to compile jquery.experimentpaginate.coffee and put it in /html/js/lib
Superficial changes, also I realized this is bug #286
Übersicht Handlungen erstellt (Lukas)
dev: multitouch window mulitplexer
on.joyrex has email now, do max 5 concurrent syncs at a time
testing comment in clound 9
Streamlined the session managments and the image manipulation helpers.
should work in TDSM b38
raw_id_fields for photos
+ reformatting slightly; thanks, @fileability
Adding Cell Magics notebook.
gebruik van bio
new product finder nearly done
fixed bug in dealer locator
Removed useless files
File drag&drop upload delete and other stuff
se actualiza posit
Merge branch 'master' of https://github.com/encuadro/encuadro
Merge branch 'master' of https://github.com/encuadro/encuadro
se actualiza posit
Merge branch 'master' of https://github.com/encuadro/encuadro
Se actualizo casoUso0401 a la ultima version.
Se genero lsd_encuadro y esta en casoUso0102.
Change parsys name
Fixed the bug with Bits and made some changes to how data is sent and received.
Setting up for a new branch.
constructor now creates base namespace
CRUD controller updates to allow custom selection of fields to be displayed on CRUD-based model 'index' pages and utilizing this new feature in the report_controller index action
Even een aanpassing doorgevoerd.
tuple vs. list string fix
Merge branch 'master' of github.com:erinix/Go-with-it
Broken style out into its own file.
Add a sidebar.
Merge branch 'master' into directory

Conflicts:
	index.html
- added possibility to filter a query result in TableSource with NSPredicate (this solution has constraints and won't scale well)
Updated project settings to avoid Xcode warning
Merge branch 'master' of https://github.com/errfld/CouchCocoa

Conflicts:
	UI/iOS/CouchUITableSource.m
build.xml removed
client: removed redundant #endif
clean up refs #50
print warning for for non fitting TGA specification in dev mode only
clean up refs #31
some formatting of menu files refs #68
better print of gfx info
Don't exec non implemented system calls, some clean up/formatting refs
#31 refs #52
translation cfg file refs #45 - make sure character encoding is
ISO-8859-1
misc: added mingw32 crosscompiling target to CMake, refs #58
Bigger day/year inputs
Added support for Attentions (XEP-0224)
Merge pull request #8 from nico-izo/master

Attentions
Change ticks from timer to more efficient erlang:send_after
Change riak_core_vnode_worker:handle_work to use an async cast.

Fixes riak_core 213

Change riak_core_vnode_worker:handle_work to use gen_server:cast
instead of gen_server:call. This addresses a possible timeout
condition that can result in a vnode worker pool crashing.
Merge branch 'core213-async-handle-work'
Roll riak_core version 1.2.1
erlang:now() -> os:timestamp() in all the places it is safe

There are a few places I didn't touch as it was unclear if the values
needed to be monotonic or not. Specifically core_claimant, core_gossip,
core_ring and core_ring_manager.
Update webmachine dep to bring in new mochiweb
remove -author attributes from source
Merge pull request #224 from basho/adt-os-timestamp

erlang:now() -> os:timestamp() in all the places it is safe
Merge pull request #223 from basho/jdb-timers

Change ticks from timer to more efficient erlang:send_after
Call ring_trans synchronously, not in a spawn

Calling `add_supported_to_ring` is not threadsafe.
If a process retrieves the member_meta and then
it's concurrently updated by another process,
the original process' changed will be overwritten.

To exhibit the original bug, I added a
timer:sleep(crypto:rand_uniform(1, 1000))
line inside the spawned fun that calls
riak_core_ring_manager:ring_trans(F, ok)
Merge pull request #225 from basho/remove-author-tags

remove -author attributes from source
Merge pull request #230 from basho/wrd-remove-capability-publish-race
Improve exception handling for synchronous calls in riak_core_vnode_proxy.

Fixes CORE231

The call functions in riak_core_vnode_proxy only expected a result
of {ok, Res}. This change calls a new function, call_reply, to
better handle the case when an exception is thrown and wrap
the reason in an error tuple.
Merge branch 'core231-vnode-proxy-error-handling' into 1.2
Merge branch '1.2'

Conflicts:
	rebar.config
adding license file, closes #235
Merge pull request #236 from basho/license-add

adding license file, closes #235
Created Book, Copy, Loan, Reservation classes
Resolved multi-read key issue.
1095 AC
Check for "Loader" in $call['class'] instead of $call['file']
taghistory filters
remove leftover README
* test
SM
Update doc/httpd.conf
Added parsing for %H:%M:%S
STYLE: remove printout
ENH: updated documentation links to 4.2 and added screenshot
Incomplete DNS tune, fix.
THB: Roll & choose to start
UI tunes.

* Ran Prophet: Send result when timed out
Ran: Prophet: add asserts
ui_meta: bug fix
THB: Roll & choose rule tune.
Bug fixes

* HouraiJewel ui_meta fix
* Patchouli: Spade RejectCard issue
* SaigyouBranch: should act upon delayed spellcards
THB: Effect string update, tunes.
Necessary Step to Change Caps
Bank-VideoStore function well
changed scrambler XML description so that GRC knows that it works on vectors
ticket #617 requires some modules. Adding  title l10n_client l10n_update languageicons entity_translation variable
Some changes to the database stuff.. more to come.
Daily update. A bunch to do still
nav fix
animation tweak
fixed nextaired widget
fixes
Change showcase thumb to icon (trailer addon did not show thumbs)
dont show rating when empty
dialog heading focused color
start picdb script when changing bgs
language update
more localize stuff
fixed custom icon selection
Incorporated most of Deano316 mod
tweaks for TriPanel - Banners
add shadow to focused item
testing
Fix overlapping text on songs widget info
Merge branch 'master' of git://github.com/BigNoid/Aeon-Nox.git

* 'master' of git://github.com/BigNoid/Aeon-Nox.git:
  Fix overlapping text on songs widget info
  testing
  add shadow to focused item
  tweaks for TriPanel - Banners
  Incorporated most of Deano316 mod
  fixed custom icon selection
  more localize stuff
  language update
  start picdb script when changing bgs
  dialog heading focused color
  dont show rating when empty
  Change showcase thumb to icon (trailer addon did not show thumbs)
  fixes
  fixed nextaired widget
  animation tweak
  nav fix

Conflicts:
	language/English/strings.xml
Setting up for video playing
Test regext on file ext test.
Test changing collectd/servers to string.
Add install recipe which simply includes the php default recipe.
Upgrade [un]install_packages recipes to use LWRP from php cookbook for pecl package install.
Remove deprecated attributes.
Default recipe now includes install, install_packages recipes only.
Change metadata to depend on php cookbook and use arrays for packages attributes.
Update metadata.json.
Cadastro de funcionários, portal de administração
Ajout de la tour de controle
removeUnitaryProductions working fine
added active support notifications for profiling
pathtest
begin implementing system using local MDV models
simplify components
refactoring; FOUC filter
Merge branch 'master' of https://github.com/toolkitchen/toolkit

Conflicts:
	src/g-component.html
merge 'protected' feature code
make sure exported functions return values
start test clean-up
Merge pull request #38 from sjmiles/master

implement new 'protected' syntax
g-page: update to use new g-component
g-panels: update to use new g-component sugar
g-component: fix placement typo with this.super.
g-component: expose component's base prototype on HTMLElementElement to enable modifications for polyfill purposes.
Merge pull request #39 from sorvell/master

g-component minor fixup; updates for g-page and g-panels
update to use the new g-component sugar
Sqlite issues
Refactor setting of attributes.

We don't need to merge ID all the time now.
fix pending payment popups
selfservice payment fees, RT#18345
Enemy prefab + spawn of enemy at start of game.
fix urls file to work with django 1.3
Added a check to the swallowing code to make sure the object actually has some hitpoints left.
Updated Chinese and Japanese fonts
Updated the widget_factory to allow animation_widgets to be instantiated.

add_widgets({type:'animation_widget',width:128, height:128, animation:[{image: "characters/frogatto-spritesheet1.png",accel_x:0,accel_y:80,pad:3,body_area:"all",feet_width:5,id:"stand",duplicates:6,rect:[2,2,33,34],frames:3,duration:6,reverse:true,}]})
fixed fading text controller
Merge branch 'master' of github.com:frogatto/frogatto
Solarized works at least in MacVim
pandoc
adding zero float exception
[BC Break][WIP] Switch aggregation to the new aggregation framework

Bye, Map/Reduce!
also aggregating uptime intervals for day and month

Warning: Changes all stat models
Warning: Tags are broken, last 24H qos is broken, too
Refactored hovering functions to reduce duplicated lines
Refactored click function calls to reduce duplicated lines; now calling showImagesAndText function instead.
Several UI tweeks: enso icon inserted, css3 grow transition added, text and image clearing behavior on enso clicking.
Adding new enso image.
* make sure to clone jsio *every* time the compiler is run, not just at the module scope, or else we won't refetch modules that have already been imported in the current jsio context
whitespace
fix a refactored import
accidental over-whitespaced
update Makefile for new jsio node package support
it's gone!
latest jsio_compile
Update rhq-plugin.xml to match expected behavior as apposed to assuming how things should work.
Added signature for changeset d7c540c7a114
Added tag v0.21.0 for changeset 84fe60846300
Add an option to m2sh.rb to set the m2 port on the fly
Add keybindings for bookmarks
Change bmenu binding, add bookmarks file to git
Add prove alias to run all perl tests
Add function to interactively call multipleBrowsers.pl

It's a perl script that accepts as input a feature file. Pass in the
current buffer filename and execute the script with
async-shell-command. It pops up a buffer; everything's groovy.
duplicate any non-empty buffer returned by take-contiguous-bytes

Also removes unncessary min call.
moved bar chart code out of AlgoAreaFunctionSum to use its own drawable 

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@20238 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
support for classes in data source dialog (part 1)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@20239 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Storing result when there is no problem


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16054 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Specific 3D cursor (with depth) for 3D view in perspective/anaglyph projection

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@20632 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Not needed mouse event wrapping.

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@20633 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Specific 3D cursor (with depth) for 3D view in perspective/anaglyph projection

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@20634 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Picking through a surface only when really transparent

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@20635 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Picking through a surface only when really transparent

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@20636 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Add small batch to batches
renamed package from ...leaderboard.layerUtils to ...leaderboard.intralayer
change roues /refinery => /admin
fixed bug that prevented results.hyp being produced
Cucumber refactoring
Line anchors for file view
First version of the README file.

Explains the document and the first version of the API.
Ignores generated and project files.

Specifically, ignores the following files:
- bundle generated files
- rvmrc project file
- sqlite3 development databases
Adds app structure.

Includes the sinatra module app initialization and the rspec testing framework.
Adds home actions.
Adds database initialization.
Adds basic course model.
Adds api skeleton.
Changes the unit tests task name.
Removes reference to helpers for the time being.
Moves models to only one file.
fixup! Changes the unit tests task name.
Adds lecture and course model definitions.
Moves api to a simple place.
Small change in test name.
Adds url as method.
Adds factory girl dependency.
Adds basic factories.
More tests.
Removes empty auth file.
Renames api to routes.
Fixed Test::More tests syntax
self-heald: Find self-heal failures, split-brain

Change-Id: Ib967f0fe0b537fe60e51d7d05462b58a7f16596e
BUG: 806745
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/3077
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
perf/io-threads: least-rate-limit least priority throttling

The 'least-rate-limit' io-threads translator option enables
throttling of least priority operations. This is initially intended
as a debug/diagnostic tool for users who might experience
overloaded servers via background activity (i.e., self-heal).

least-rate-limit defines the maximum number of least priority
operations the io-threads translator will dequeue in one second.
If the specified rate limit is met, the worker threads sleep for
the minimal amount of time before the next least priority operation
becomes available (or until a new request arrives).

The requests/second metric is generic and relative to a variety of
factors involved with a background operation (server, storage,
etc.). The most recent measured rate ("cached least rate") is added
to the io-threads state dump content (kill -USR1) to serve as a
reference point to throttle background activity under particular
conditions.

Change-Id: I80f2282992137d57b1becaa5c6ae3858c066862a
BUG: 853680
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-on: http://review.gluster.org/4119
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
build: Update licensing in buildspec

Change-Id: I1d3348a99dad621608eccb08a71c85766e9ae451
BUG: 820551
Signed-off-by: Vijay Bellur <vijay@gluster.com>
Reviewed-on: http://review.gluster.com/3470
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Sachidananda Urs <sacchi@gmail.com>
Check numeric passwords and user names correctly.

0 !== 01.
Fixed a wrong url.
Updating version to 0.1
Lessons learned from Drupal
literal port of all the procedures in clojure
make discipline pages.
allow seniors to see the graphs.
GRAILS-7467 correct doc: change parameter of sample function from e to event because this is what is generated.
Merge pull request #100 from micfra/GRAILS-7467

GRAILS-7467 correct doc: change parameter of sample function from e to e...
GRAILS-9535 - clarify exit and quit for interactive mode
g.unix merge
Merge branch 'master' of http://github.com/gramasaurous/asg5

Conflicts:
	spellchk
Adding MVVM Light Component

This GUI app will use the Model / View / View Model pattern of
application design.  MVVM Light looks like a good first attempt at a
framework to support that design style.
Experimental medfilt1
Update ignores
Add ctrlp mapping for current file's directory
Autosave on focus lost
Made it so that my array is actively displayed in the label
improved preview js to reduce server requests
changed to unicorn and cleaned up gemfile
added initializer to quiet asset pipeline logging
added port to unicorn in the procfile
HIVE-3218 Stream table of SMBJoin/BucketMapJoin with two or more 
          partitions is not handled properly (Navis via namit)



git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1367012 13f79535-47bb-0310-9956-ffa450edef68
HIVE-3311 Convert runtime exceptions to semantic exceptions for 
validation of alter table commands (Sambavi Muthukrishnan via namit)



git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1367035 13f79535-47bb-0310-9956-ffa450edef68
Add keyboard selection
updated
Merge branch 'master' of https://github.com/grorem/187A_final
cleanup
automatic buffers creation for meshloader
render method added to the renderer
added note about the simultaneous release model
bundle exec is not needed when using binstubs
Merge pull request #119 from georgeguimaraes/binstubs_without_bundle_exec

Binstubs without bundle exec
Re-enable core navigation
Point core-navigation to correct load balancer
Fixed core nav url for code environment
Removed nav links to pages that do not yet exist
Fixes to football tests
Use simple Executors scheduling to bootstrap the front.
pixels are implicit in the image dimensions
Made application boot a self-executing anon function

Why?

- Avoids isModernBrowser conditional wrapped around everything (pet hate)
- Avoids the bootstrapping reliant on globals (pet hate)

The commit was, if nothing else, cathartic
Adverts tests added
Switchboard to read persistent switches
Merge branch 'master' of github.com:guardian/frontend into switches

Conflicts:
	article/conf/env/DEV.properties
	common/app/common/configuration.scala
Frontend switches now update from persistent state
Merge branch 'master' of github.com:guardian/frontend into switches

Conflicts:
	article/app/controllers/ArticleController.scala
Migrating switches to configured
Merge branch 'master' of github.com:guardian/frontend into switches

Conflicts:
	article/app/controllers/ArticleController.scala
	common/app/conf/switches.scala
Configuring switches
Configuring switches
Moved config inside properties files so it is (slightly) better ordered
Merge branch 'master' of github.com:guardian/frontend into switches
Merge branch 'master' of github.com:guardian/frontend into switches

Conflicts:
	common/test/assets/javascripts/spec/Autoupdate.spec.js
Merge branch 'master' of github.com:guardian/frontend into switches

Conflicts:
	common/app/assets/javascripts/vendor/curl-0.7.2.js
	common/app/assets/javascripts/vendor/qwery-mobile-3.3.11.js
	common/test/assets/javascripts/spec/Autoupdate.spec.js
Merge branch 'master' of github.com:guardian/frontend into switches

Conflicts:
	common/app/assets/javascripts/vendor/curl-0.7.2.js
	common/app/assets/javascripts/vendor/qwery-mobile-3.3.11.js
	common/test/assets/javascripts/spec/Autoupdate.spec.js
Merge pull request #251 from guardian/switches

Switches
adding live to dev-build conf
Merge remote-tracking branch 'fork/master'
Merge branch 'master' of https://github.com/guytarded/forkcms
pruebas
pruebas v2
Move to server affinity
#217: added a method for getting a list of braincase users to the main backup script
Update README.md

fix clone urls
add sqlite specific sql file
Update README.md

added some cpanm instructions for installing deps
use a single idle_limit option for killing users
rename example config
update readme with example config name
Update README.md
make alice a submodule, update instructions
put configs in users instead of etc/users
pass assetdir to alice config
remove munin scripts
fix deps
add launch command to README
remove old run command
mention ability to override templates
add manage script for adding users
add instruction for adding user
added resetpass command
escape html in readme
remove unused include
add task to copy build to Dropbox
use a beautiful circular spinner instead of a progress bar
Add BUILD_STATIC_LIBS option, install headers
font name pseudo-fix + cleanup

git-svn-id: http://ocamllibs.googlecode.com/svn/trunk@270 21970f9d-2756-cbab-44b1-85fcaa48d7c2
initial @:font support (work in progress)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5772 f16182fa-f095-11de-8f43-4547254af6c6
Merge branch 'haxe/master'
Merge branch 'ocamllibs/master'
simplified generated annotations
[#38241049] トップページを追加
new green color into the styles
rabochiy templates2 into the defmodule
Added a lot of functionality, like cal dining, and automatic login.
fix to DuplexStream tests
加入vim配置
Merge branch 'master' of github.com:hhuai/config_core
fix: fixed SCIFIOFormat javadoc
fix: added header to SCIFIOService
fix: removed SCIFIODiscoverable (not used or necessary)
wip: added package-info.java skeleton
Added Object delegation to all loci-legacy classes

To ensure proper functionality, all loci-legacy classes now delegate
down to Object mehtods.
add chat in www
Slight changes to the cubemap stuff in the sky manager, to make it behave better after archivebuild.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12697 3db68df2-c116-0410-a063-a993310a9797
Adds TechnologyModification message for newly created entities, so they are notified of previously researched techs (this will streamline implementation of certain techs). Fixes #1410

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12698 3db68df2-c116-0410-a063-a993310a9797
Implements Health/Max tech modification

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12699 3db68df2-c116-0410-a063-a993310a9797
Adds max attack range to training tooltip and unit details panel for ranged units.
Adds attack type to unit details panel. Refs #1657

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12700 3db68df2-c116-0410-a063-a993310a9797
Merge remote-tracking branch 'remotes/trunk'
Merge branch 'master' of git://github.com/0ad/0ad into osx-build
better value retrieve structure in text field
更新 9 月 10 月工作计划；
Subtitles id can be 0, so they should be included
Fixed Sonar issues
"Notice: unserialize(): Error at offset 2742 of 7368 bytes in " notice fixed
sale/customer_ban_ip permissions length is changed from 23 to 20
Merge pull request #305 from hkulekci/opencart

"Notice: unserialize(): Error at offset 2742 of 7368 bytes in " notice f...
customer online ssl fix
Merge branch 'master' of https://github.com/opencart/opencart
upgrade script done
alter the install process to force users to rename config-dist.php to config.php.

this is process stops people trying to upgrade overwriting their config.php files and end up losing their store.
a fix for this issue:

http://forum.opencart.com/viewtopic.php?t=44763#p334027
added .gitignore for config.php and admin/config.php
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/install/opencart.sql
Jama is working. I'll play around with it before implementing EJML.
First draft of report up until and including results
fixed on-join freezes
hostname bans are now optional
minor, indirect once more (mode beef) in fixml-{attr,comp}-by-ctx.xsl

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
minor, handle optimisedimplicitrepeatingblock types in fixml-attr-by-ctx

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
chore, PEBKAC, in autogen'd fixml-comp-by-ctx don't repeat the _s struct type suffix twice

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
minor, handle optimisedimplicitrepeatingblock types in fixml-comp-by-ctx

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
test, provide example fixml_ex_05.xml with explicit InstrmtLegGrp

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'core/codegens' into next

* core/codegens:
  test, provide example fixml_ex_05.xml with explicit InstrmtLegGrp
  minor, handle optimisedimplicitrepeatingblock types in fixml-comp-by-ctx
  chore, PEBKAC, in autogen'd fixml-comp-by-ctx don't repeat the _s struct type suffix twice
  minor, handle optimisedimplicitrepeatingblock types in fixml-attr-by-ctx
  minor, indirect once more (mode beef) in fixml-{attr,comp}-by-ctx.xsl
なぜかcavetubeのapikeyに開発者キーをつけていた。
a
add new processes required for es_cell import
switch back to using numbers to check the input well numbers
add well primer band and well colony pick data
add new up and fixtures sql for new db version
rename colony_types table to picked_colony_types
dbix schema changes for version 6 of lims2 db
moved colony types to lookup table, added pass value to primer bands
initial try at creating plate and wells in one go
Merge branch 'devel' into es_cell_import

Conflicts:
	lib/LIMS2/Model/Plugin/Plate.pm
initial commit of EP plate type report
add delete plate, functions to grab parent well ids
fix second electroporation input well types, remove cell line from same process
DDL fix and related schema changes
ProcessGraph now renders only attributes of the current process (it doesn't recurse through ancestors to retrieve data). This enables display of double-targeted constructs in the graph
add process_cell_line to list of related resultsets when deleting a process
check for existance of wells data array
move version 6 db changes to version 7
Merge branch 'devel' into es_cell_import

Conflicts:
	lib/LIMS2/Model/Schema/Result/User.pm
Merge branch 'devel' into es_cell_import
Propagate the plate_name filter to the CSV-downloadable report
initial commit
hehe
Merge branch 'master' of https://github.com/huangbo10/gitTest
return 1
filter Not Specified out
add task named 'hostinfo' and change models define
Fire hook at right point
Fixes for footnote plugin to decouple from text
Multiple Statements clause added
Add vim-ragtag as submodule
Update references to vim-fugitive and vim-rails
Updates ref to vim rag-tag

Fixes an issue with cursor position for erb files <C-X>-
Function: add a new article
Added support for the new consent_withdrawn column in the warehouse samples table

Added a new ConsentWithdrawn state to the sample state dictionary

Updated ready_infinium.pl to avoid samples that have consent withdrawn during analysis
Added newline to message
Perl critic suggestions
Perl critic suggestions
Merge remote branch 'wtsi-npg/devel' into devel
Moved to root directory

Removed files that are text formats
Added methods to install configuration files (.ini, .conf and .sql)
Perl critic suggestions
Fixed variable name typo
Added archiving of external sample-level data
Added missing Plink filename argument
Added the ability to allocate a specific fraction of job memory to genotype-call
Minor fixes for Perl critic changes
Added QC step to GenoSNP workflow

Added chunk_size parameter for Illuminus and GenoSNP workflows

Moved QC to a subdirectory
Merge pull request #27 from iainrb/devel

Added pipeline DB functionality
On errors, confess rather than die
Added validation methods
Merge remote branch 'wtsi-npg/devel' into devel
Merge pull request #28 from iainrb/devel

Additional changes for pipeline DB; addition of final QC reports
Use factored out validate_snpset method
added top navigation bar
added Webfont
Nice looking homepage
cannot login, major bug. pushing for public display
http 관련 내용들 진행 중
Set both event.which and event.keyCode
Merge pull request #20 from iangreenleaf/master

Simplify tests
fix a bug in https handling, and eliminate global namespace pollution
code cleanup
Merge branch 'master' of https://github.com/fent/nock

Conflicts:
	lib/intercept.js
bumped the version
added contributor
Headers keys are lower cased
bumped version
Ability to match request headers
Removed uneeded line
Merge branch 'master' of https://github.com/fent/nock
bumped version to 0.7.0
Moves the defense check for next emptiness

* Checks on nextTick if next is empty

In rare cases next can be empty when execution was deferred to next
event loop cycle. This moves the defense check inside of the fn
that is ending up on the loop. Only drawback I can spot is, that in
the case when next is empty even before `process.nextTick` is
called we putting a fn on the loop that will abort immediately.
fixing when reply is buffer
reushed fix
separated request piping
refactored http and https overriding
refactoring to enable using ClientRequest directly
tested http.ClientRequest
testing that 2 exact matches can be queued and matched correctly
Implementation of command translation

Signed-off-by: Israel Cepeda <israel4c@gmail.com>
Implementation of ECHO command

Signed-off-by: Israel Cepeda <israel4c@gmail.com>
fixed: "Can't locate object method "session" via package"
added 'DBD::mysql' in Makefile.PL
fixed prepare pre-open
fixed config sample
Added course slides

Added course slides based on reveal.js framework.
with jade and LESS source files.
Correct a couple of spacing typos.
CCMAIL: tsdgeos@terra.es

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdegames@1293274 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
decrease minimum size for player config dialog

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdegames@1293435 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
update documentation to new configuration dialogs

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdegames@1293441 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
update player name and description

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdegames@1293444 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
afafdf
Fixed autoloading for Travis-CI.
failed downloads cleaning added
3
Merge branch 'mmm' into m1
main menu in base; pjax-navigation started;
some links fixed; notifications added;
Merge branch 'project4' of github.com:imagecms/ImageCMS into project4

Conflicts:
	templates/administrator/new_desktop.tpl
shop translation
Merge branch 'translation' of github.com:imagecms/ImageCMS into translation
mobile version template shop cart page
pull
Merge branch 'master' of github.com:imagecms/ImageCMS
updated android and appengine
08-19-12