labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #4 from rvosa/master

New changes to merge with yours
Merge pull request #5 from rvosa/master

More things to pull in
Corrected to the latest release number and date stamp.
Merge pull request #6 from rvosa/patch-1

Corrected to the latest release number and date stamp.
my commit message
adding domain object and service object stubs
adding documentation to unit tests
adding documentation to legacy script files from phylota
adding documentation to legacy script files from phylota
adding documentation to sql script files
Merge branch 'master' of https://github.com/rvosa/phylota

Conflicts:
	lib/Bio/Phylo/PhyLoTA/Service/SequenceGetter.pm
	script/phylota/pb.pm
	script/phylota/pb_backupDatabase.pl
	script/phylota/pb_backupTables.pl
	script/phylota/pb_crawlNCBI.new.pl
	script/phylota/pb_crawlNCBImodel.new.pl
	script/phylota/pb_finalize_node_table.pl
	script/phylota/pb_find_duplicate_gis.pl
	script/phylota/pb_find_duplicate_gis_from_file.pl
	script/phylota/pb_find_magic.pl
	script/phylota/pb_generate_magic.pl
	script/phylota/pb_make_anc_clusters.pl
	script/phylota/pb_master_make_db.pl
	script/phylota/pb_populate_seqs.pl
	script/phylota/pb_put_trees.pl
	script/phylota/pb_rank_changes.pl
	script/phylota/pb_remove_duplicate_gis.pl
	script/phylota/pb_restoreTables.pl
	script/phylota/pb_setup_ci_gi_table_from_file.pl
	script/phylota/pb_setup_clustertable.pl
	script/phylota/pb_setup_node_table_from_file.pl
	script/phylota/pb_setup_parents_postmodel.pl
	script/phylota/pb_summary.pl
	script/phylota/schema.sql
	script/phylota/var/www/cgi-bin/advsearch.cgi
	script/phylota/var/www/cgi-bin/blastgenetree.cgi
	script/phylota/var/www/cgi-bin/genetreesearch.cgi
	script/phylota/var/www/cgi-bin/my_genetreesearch.cgi
	script/phylota/var/www/cgi-bin/pb.cgi
	script/phylota/var/www/cgi-bin/pbariz.cgi
	script/phylota/var/www/cgi-bin/sql_changes.cgi
	script/phylota/var/www/cgi-bin/sql_getcluster.cgi
	script/phylota/var/www/cgi-bin/sql_getcluster_fasta.cgi
	script/phylota/var/www/cgi-bin/sql_getclusterset.cgi
	script/phylota/var/www/cgi-bin/sql_getconcat.cgi
	script/phylota/var/www/cgi-bin/sql_getdesc.cgi
	script/phylota/var/www/cgi-bin/sql_getmodels.cgi
	script/phylota/var/www/cgi-bin/sql_getrankings.cgi
	script/phylota/var/www/cgi-bin/sql_getspecimens.cgi
	script/phylota/var/www/cgi-bin/sql_gettree.cgi
	script/phylota/var/www/cgi-bin/sql_gettrees.cgi
	script/phylota/var/www/cgi-bin/sql_lca_query.cgi
	script/phylota/var/www/cgi-bin/sql_taxquery.cgi
	script/phylota/var/www/cgi-bin/viewgenetree.cgi
resolved conflict
added method get_largest_cluster_for_sequence which returns all the sequence members of the most inclusive cluster to which the argument sequence belongs
adding unit test for querying clusters and cigi table
adding unit test for querying sequence table
Added temporary gemspec.
test code
big light
incorrect but beautiful
t
add anti-aliasing
Merge branch 'another' of git://github.com/gtxx3600/SBPRay

Conflicts:
	engine/PathTracingEngine.cc
	main.cc
Fix a stupid bug in aae.
Added instance (tab) id to magpie debug name

Signed-off-by: IUnknown68 <arne@salsitasoft.com>
Travis: only test master branch
added nsfetchedresultscontroller to all the views
Added personal user's page
Added form for sending message
Added form for creating workers with dependencies
Added page for creating Roles, Regions, Worker Type, Job Type
Modificated existing tags for new one and simplify them
fix cord show instance
improves cucumber tests
fixed another item dropping bug
show weapon type & damage in the tooltip
Fix annoyance with =pm vim macro

Setting iskeyword+=: meant that if I had Some::Perl::Module then w
would skip the whole thing.

Changed to using isfname/cfile instead

Waiting to see what this has broken
attempts to get mozmill back in action
resolving mozmill test harness initialization issues
fix Haskell grammar and pp
fix arrow syntax
improve error message
fix layout sugar
restored verbose option to check_id_map.py from suppress_std_out

git-svn-id: https://qiime.svn.sourceforge.net/svnroot/qiime/trunk@2917 b0fff984-a1a5-4f5a-893b-b8b2c7becc1a
added a new option to define the use of unscaled or scaled plots.




git-svn-id: https://qiime.svn.sourceforge.net/svnroot/qiime/trunk@2918 b0fff984-a1a5-4f5a-893b-b8b2c7becc1a
Added new compare_distance_matrices.py script that effectively replaces the old with three different Mantel-based statistical methods. Updated supporting library code in merge from qiimeutils/microbiogeo (classes now use properties, runAnalysis() has been replaced with __call__, replaced math library calls with numpy calls, more code cleanup and refactoring to reduce duplicate code). Added new tutorial for distance matrix comparison.

git-svn-id: https://qiime.svn.sourceforge.net/svnroot/qiime/trunk@2919 b0fff984-a1a5-4f5a-893b-b8b2c7becc1a
Added choices type for tail_type option. Results files for partial Mantel and Mantel correlogram now report their tail types. Updated tutorial to reflect these latest changes.

git-svn-id: https://qiime.svn.sourceforge.net/svnroot/qiime/trunk@2920 b0fff984-a1a5-4f5a-893b-b8b2c7becc1a
Add code to compute conditional uncovered probability
from Manuel LLadser's paper.



git-svn-id: https://qiime.svn.sourceforge.net/svnroot/qiime/trunk@2921 b0fff984-a1a5-4f5a-893b-b8b2c7becc1a
rename top level function into cup_driver, add unit test for it



git-svn-id: https://qiime.svn.sourceforge.net/svnroot/qiime/trunk@2922 b0fff984-a1a5-4f5a-893b-b8b2c7becc1a
don;t need the lineages from the otu table.



git-svn-id: https://qiime.svn.sourceforge.net/svnroot/qiime/trunk@2923 b0fff984-a1a5-4f5a-893b-b8b2c7becc1a
Fix innocuous javascript error if frame is closed.
アニメーション実装１
バージョン番号の変更
add update function to loadLibrary
FIX inverted translations for Adding to Kismet filters
Merge pull request #427 from Simounet/kismet

FIX inverted translations for Adding to Kismet filters
retarded space fix
removed globals ffs
Fix application descriptor
task #00042-theme_search: Themeed
Merge branch '00042-theme_search' into develop
Merge branch 'develop' of github.com:shumer/PD-new into develop
Slight optimiztion for floats and ints.
Update notes for submitted changes

* Conflict with gordon on bank account test
Capi, Uni - seti
Fix up merge
Added live config file
Test successful execution of cmake and make.
Improved rrr_vector_15 and fixed uintX output

* We use only 2x64kB lookup tables for rrr_vector_15 which are
  also hugetable mappable, instead of 2x128kB.
Fixed formatting
Added information about lookup-table sizes
Reduced space for lookup tables. Modularized code.
Added FLAG for compilation w/wo binary search.
Fixed name of compile flag.
Addressed issues #28 and #29.

Replaced double bracket notation from bash to single
bracket notation to make the script work with sh.

Added force flag to the copy command for the gtest
files.
Added NOSELCACHE compiler flag to disable hinting in binary search
select.
Added NOSELCACHE compiler flag to disable hinting in binary search
select.
fixed NOSELCACHE flag.
forgot to do the same thing for select1 and select0
Merge pull request #32 from mpetri/development

Added NOSELCACHE compiler flag to disable hinting in binary search
Fixed bug for input length is a multiple of K*t

The vector used one to much space in the case
that the input length is a multiple of the chosen
block size K times the sample rate t of rank
samples. The bug occurred when a 32 MiB bitvector
was used as input and K=16 and t=32 was set.
Deactivated debug output.
Added flag RRR_NO_OPT, which switchs of the optimizations
RRR_NO_OPT implies RRR_NO_BS now
Added macros for experiment
Off by one bug now really fixed.

The correction of commit
37060ee9823cc7bf3ca69aa3b06060282aedfec5
has not solved the off by one problem for all cases.
Now it should be fine.
Merge branch 'development' of github.com:simongog/sdsl into development
added more spacing to idea list
added search functionality to home page
added search functionality to idea list page
parsed out the sub search form and added an error base
Make util functions importable rather than builtin

This will help getting rid of static checker errors.
Also it will make
application more interpreter agnostic (__builtin__ is said to be CPython
implementation detail).
Refactor quite a bit

Fix imports so no fiddling with sys.path would be needed
Use more GObject properties
Move out sync code to a new file
Move out cell renderer code to a new file
Make more base classes, they are easier to reason about

And most important of all:
Reduce time needed to fill items list by more than 2x which results in
faster application startup times and more responsive changing between
various filters.
Reduce WebKit cache level

WebKit will not cache files we already have on local filesystem.
Refine log messages
Don't show notifications when they are disabled
added Array#map polyfill

also broke polyfills into their own file.
Fixed trait inheritance bug in the s2js, so controls throw events properly.
Customization persistence.
Merge branch 'develop' of github.com:siroky/Payola into develop
Previous commit fix: the flip animation was not merged correctly. Added some scala doc and removed few TODOs.
Merge branch 'develop' of https://github.com/siroky/Payola into develop
configs
Merge branch 'master' of github.com:sirrice/moose
update Podspec to latest version
fix c-e also for simple.vim
little timespan format fix
added command to find pictures with google
auto login is now probably even triggered after an irc disconnect
sdm: cleanups, working draft of condensation, advection as an option
Initial commit
initial commit of dart demo project.
Merge remote-tracking branch 'origin/master'
changed font size from 14 to 18px
opt support http protocol, can request HTTP/1.1 or HTTP/1.0
hevc: HEVC video decoder
hevc: add a dummy demuxer
hevc: integrate JCTVC-J0268: sao coding changes
added true count for visits
parameter tuning
changed to instable search
rm opt param
binaries update
cleanup
mod in sd var count
limited depth in ab pruning
bug in mate scoring
added k parameter
added search extension for pawn promo
mod in repetition detection
parameter tuning
parameter tuning
parameter tuning
parameter tuning
parameter tuning
finx in repetition
parameter tuning
parameter tuning
Added description to get_plotrange, optimised ang_thresh, slightly larger range
Fix 3D graphics 404 Error
include instructions to build Sage with SSL
version 0.5
print Mathics version when testing
use setup.py develop before release
include Three.js in COPYING
now working on 0.5.1dev
new gallery
typo in doc
typo
Started implementing DSolve
Started on to_sympy for Derivative opperator
High order derivates for Derivatives to_sympy
sympy equalities handled by to_sympy
C[i] paramaters for to_sympy
Undo accidental change to SympyExpression
Sympy requires str not unicode
Never assume there are a certain number of leaves.
Added to_sympy_direct method to Derivative and Expression
kwargs to to_sympy
Resolved a tiny compatibility issue for removing the `　' in front of paragraphs.

Signed-off-by: Snakevil Zen <zsnakevil@gmail.com>
Resolved a tiny compatibility issue in parsers of `yzuu.com'.

Signed-off-by: Snakevil Zen <zsnakevil@gmail.com>
Dodano wyjatek, gdy plik nie istnieje
Merge pull request #27 from snups/master

Dodano wyjatego gdy plik config.xml nie istnieje
Router in progress.
Mergin
Merge branch 'master' of https://github.com/soncco/examen
Ver examenes
Set the post image's maximum size, not the normal size
dav debug
fix SIGFPE (3192)
coldet: re-add support for (RIGHT-CIRCULAR ONLY) cylinders
fix an agent issue with non-system classloaders
Generating unique ClassBinding name per method signature
Merge pull request #81 from square/kiran/same-providers-unique-name

Generating unique ClassBinding name per method signature
qwe
Merge branch 'master' of https://github.com/squidyru/test
sqe
setting wf name for retention
Escape only if not already escaped
Ignoring empty guards.
Convert database cell to number.

The "if (rs.rows.item(0).num)" is true even if num is actually zero.
Fetch titles from original page, if ril doesn't provide one.
added a default payment term for invoice if company value is nil
added presence validator for payment terms
Debug level in sender
Merge branch 'master' of github.com:stilgar/Spidy
Script launcher
Kill trailing \n
Update homepage content and layout
added a bunch of styling stuff
Update racewindow while racing.
Optional case-insensitivity while parsing with =char
Better error reporting using EITHER plus MAYBE-level error handling.
Cardinals and ordinals into numbers.
more job on website
Add reading/writing ID3v1 genre in number
Merge remote-tracking branch 'TsudaKageyu/id3v1-genrenumber'
comment backbone views
heroku rake support
use the sliver searcher
Enable code contracts

Enable code contracts feature in Yacq and YacqSilverlight.
Enable code analysis feature in YacqSilverlight.
Fix the way to generate non-signed assemblies, clean up project files

Fix the way to generate non-signed assemblies (NOSIGN), remove attributes in
AssemblyInfo.cs and write properties in project files.
Clean up project files.
auto commit at 2012-12-26 14:10:39
auto commit at Mon Nov 12 09:03:28 Local time zone must be set--see zic manual page 2012
Added page_scripts
Merge branch 'master' of github.com:tatemae/tread
Fixed failing specx
Added like_ids
Version bump to 0.3.21
Regenerate gemspec for version 0.3.21
Removed cache.manifest
bump to 3.0

* add the new url of the api
* update some code to respect 3.0
* update form
add Connection MT functional test + fixed race-condition in ConnectionStateActor + CAMQPFrameDecoder refactoring
New Pathogen commits
Delete subs, about to move them
++release date

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
Missing cat in __package_yum

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
++changes(2.0.10)

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
implement --state exists

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
Merge branch '__file_exists' of https://github.com/asteven/cdist
+= example

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
Merge branch '__file_exists' of https://github.com/asteven/cdist
++changes(2.0.10)

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
Added sender and test for sender
modifs des levels
Search is Case Insensitive
Postit are selectable
Use removeFromParentAndCleanup instead.
Added Action (and method) for cleaning orphaned files.

TODO: call the cleanup automatically when it make sense.
I kant spel.
Add `psql` to pg.

It returns the client path and options to pass to `do_system()` or `backticks` to execute stuff against PostgreSQL.
Fix broken `log` output on Perl 5.12 and earlier.
Fix syntax error with use of `when` on 5.10.
initial
Merge branch 'master' of github.com:thewyss/proto
Start refactoring of parameters, sasl, mechanisms
Start work on GSSAPI mechanism using py-kerberos
Clean up properties, mechanism selction
Miscellaneous fixes, make sure example.py runs
Various fixes to GSSAPI mechanism
Remove license.py
SWIG-based C# bindings and examples
Changed layout
Put some debugging on "sendAppToFront"
Added geocoding for addresses.
Tweak specs
Add the BCP47::Tag class
Remove the Subtag namespace

Makes for less typing!
Version bump to 0.2.0
Update BCP47::Tag initialization
Rename README and update
Version bump to 0.2.1
Regenerate gemspec for version 0.3.0
push permissionDB
Permission
Merge branch 'master' into pushPerm
permissions
Fixing a bug where an anonymous call will be displayed as the first
contact in the contact database.
Fixing a bug where the screen would not easily shut down after a call.
Fixing a bug where an incoming call from '123' would match a contact
with '12345' as a number.
Small keyboard simplification.
Fixing a bug with where the keypad would get "locked" in long press
mode.
Fixing #2620, clearing the phone view once the call is connected.
Plugin in the new contact WebActivity
Fixing #2620
use the en-US locale by default
Merge pull request #2783 from etiennesegonzac/7-dialer-bugs

7 dialer bugs
Merge pull request #2732 from gregorwagner/pushPerm

Push permissionDB to the device
Merge pull request #2786 from fabi1cazenave/calendar

[calendar] use the en-US locale by default
Add the web activity entry for sms app to activate contact app with specific contact information page.
Merge pull request #2788 from steveck-chung/sms-v1-bug-fixing

Add web activity entry for sms app to activate contact app with specific contact information page.
Small style fixing for touchable area
Merge pull request #2789 from borjasalguero/feature_sms_screens

[SMS] Small fixing styles for back button
Merge branch 'master' into remove-voicemail-statusbar
base: Support tagged gensyms

The complete anonymity of a gensym can make debugging macros and macro usage
even more difficult than it has to be. By inserting a tag into a gensym, error
messages have some chance of being helpful.
Shrink a larger-than-needed buffer for tagged gensym generation
poly root finding algorithm. force conversion of Integer Polynomial to float representation
Merge pull request #683 from pao/topic/namedgensym

Support for gensyms tagged with a string
Gensym macro for generating and binding named gensyms.
basic Options type and test suite
fix #678
fix #675
make gc marking tail recursive where possible
fixes #680
fix #684
exporting some u8_ functions
adding UTF8 strlen
fix #676
Merge pull request #686 from stefan-k/master

fix #676
fix #687
Merge pull request #689 from HarlanH/Options

basic Options type and test suite
Added extras/bitarray.jl (almost complete)
completed bitarray.jl
bitarray: small fixes
bitarray tests
fix #691
allow ~ as an infix operator
ticket announce チケット販売のアナウンス追加
add english ticket sales
force japanese locale for doorkeeper
changed docs after change to catkin_package macro
more text for docs
typos
Merge pull request #210 from tkruse/groovy_docs

Groovy docs
Merge pull request #214 from tkruse/plugin_support

Plugin support
Merge pull request #213 from ros/plugin_support

Reexport plugin declarations into the manifest.xml required for plugins
version 0.5.36
create_plugin_xml.py now forwards rosbuild tags and tags with plugin attributes in exports.
updated doc (#210)
extended plugin tests
現在時刻

現在時刻を表示
tiny HTML fixes
finaliziran sadrzaj
ispravljene manje gramaticke greske, finalna verzija
finalna verzija
finalna verzija
finalna verzija
jpg -> png
Make install script linux compatible
Make git aliases use sh instead of bash builtins
change my project directory to src/
Make ag the default search tool for Ack.vim
Underline search results
Add promote variable to rspec let
Change prompt to have less
Ingore tag files
Add basic fish support
Add git working tree status to fish prompt
Remove excess code
Fix working tree status in fish
Add bundle exec alias
Tell vim to use bash even when using fish
Merge branch 'master' of git://github.com/griffy/CS1567
updated NS total theta
Complete the data set of basic questions
Add remaining questions for "SBF Binnen"
fixed PeerConnection.close()
adjusted timing
simplified pom.xml, udated org.apache.felix
load jquery tabs and theme for album tools menu
New change without making a change to the normal website :)
Move stuff to src.
Autotools.
We don't need this.
Updated Router documentation to reference new Application.router property

this also includes some small edits for clarity
Load proejcts tab when starting a project
Step 4: Finished | Overall fixes for steps
added more slides
Merge branch 'master' of https://github.com/ttsang/raichu
added
started converting to vector/getline; errs
fixes to internal link creation.
README update for dijkstra.js
ch 24: listing 24-2
remove unused s:Dictionary._registered_words_modified
use Preedit.get_old_str() instead of Preedit.get_display_str()
add XXX comment to Preeedit.get_begin_col()
refactored s:Preedit.rewrite()
add Preedit.get_preedit_range()
refactored s:eskkcomplete() a bit
add Preedit.{get,set}_old_{line,col}() functions.

It returns the *true* getline(".") and col(".") values
even while completion.
fire s:handle_popupmenu_keys() only when henkan phase.
remove Preedit.get_inserted_str().
oops
fix Preedit.get_preedit_range(), Preedit.get_begin_col(), updating Preedit._old_line
遷移エフェクトの時間を修正
popcorn -> wait for 1 min
version 1.1.1 changes
bug fix for special rules were not saving
Add crl command
Added proper name to sidebar.
Change width of text areas to 100%.
Add robots.txt.

This ensures that robots find guidance on the site, and that we do not get 404 not founds.
added (failing) specs for the cites_listed (a.k.a. level_of_listing) flag
fixed appendix search by changing condition to OR
refactored checklist slightly
added basic common name specs
[#41219815] Added controllers, views and routes to manage change types
Se hizo la modificación e CausalEqualsExpression y ConcurrentEqualsExpression, para soportar funcionalidad de los relojes vectoriales. Event es modificado para ser asociado a un Reloj Vectorial. Se modificó CausalDemo como ejemplo que fundamentara el mecanismo para asociar un Event a un determinado Reloj vectorial (TransportedVectorTime)
Udate channels.conf
Update script xbmc
Fixed minor bug in fish_prompt
Added hashtable schema
redeploy
redeploy
redeploy
foo
redeploy
redeploy
redeployer
Revert "yo yo"

This reverts commit dc5f4ed505790796710c5592ce3ff76a5662b163.
Prevent potential warnings about macro redefinitions.
Added examples for paying with cherries
make mopsy fonts larger for video

Conflicts:

	src/etc/utils/mopsy.py
Highlight also killed queries
adding more generic StepperController node
Merge pull request #78 from woeishi/7f41ab2db46205c2242da60f22e37b6a9a83081d

adding more generic StepperController node
updated to JCL.231 /JVCL.345 build 4197
Merge branch 'develop' into JCLUpdate
updated iphelperapi to unicode version
replaced all references to Char/UTF-8 charencoding
Merge branch 'develop' into d2009
delphi XE update:

- managedVCL
- jcl
- TD3DColor removed from ColorUtils now referencing DXTypes instead
- DFT utils had ambiguous call to SinCos()
- minor change in WindowNodes
Merge branch 'develop' into d2009

Conflicts:
	vvvv45/src/thirdparty/complexmath/Versions.INC
d2009 update for crack
vvvv.drc changed (whatever that is...)
Merge branch 'develop' into developXE
replaced Addflow3 with Addflow5
Merge branch 'develop' into Addflow5
updated crack to addfflow5
Merge branch 'develop' into Addflow5
Merge branch 'develop' into developXE

Conflicts:
	vvvv45/src/core/Startup.pas
	vvvv45/src/core/pins/StringPins.pas
	vvvv45/src/vvvv.dproj
Merge branch 'develop' into developXE
Merge branch 'develop' into developXE
Merge branch 'develop' into developXE
Merge branch 'key_mouse_state_rework' into developXE
Merge branch 'develop' into developXE
* MPlayer: Update build script.
* ORBit2: Added version 2.14.19. Needed by some GNOME2 packages.
* ptbatterysystemtray: Upgraded to 1.0.0rc2. Not used in razorqt 0.5.0.
* razorqt: Upgraded to 0.5.0. Fix environment handling and renaming init
    script to razorqt instead razor.
* clementine: Upgraded to git 20121001_07abe82.
* fcgi: Added version 2.4.0. Needed to run Perl/CGI based script on nginx.
* fcgiwrap: Added version 1.0.3. Needed to run Perl/CGI based script on nginx.
* flash-player-plugin: Updated build script.
* gconfmm: Added version 2.28.3. Needed by some GNOME2 packages.
* gnome-common: Added version 2.34.0. Needed to build some GNOME2 packages.
* gnome-mime-data: Added version 2.18.0. Needed by some GNOME2 packages.
* gnome-vfs: Added version 2.24.4. Needed by some GNOME2 packages.
* hotot: Upgraded to git version 9c8c8a2.
* libbonobo: Updated build script. Needed by some GNOME2 packages.
* libbonoboui: Updated build script. Needed by some GNOME2 packages.
* libgnome: Added version 2.32.1. Needed by some GNOME2 package.
* libgnomecanvas: Updated build script. Needed by some GNOME2 package.
* libgnomeui: Added version 2.24.5. Needed by some GNOME2 packages.
* libreoffice: Upgraded to 3.6.2.2. Fix build script.
* libtorrent-rasterbar: Upgraded to 0.16.4.
* libxml++: Upgraded to 2.34.2. Needed by some GNOME2 packages.
* lxdm: Upgraded to 0.4.1. Fix init script.
* me-tv: Added version 1.4.0.10.
* qbittorrent: Upgraded to 3.0.5.
* rekonq: Upgraded to 1.2.
* tvtime: Added version 1.0.2. Use some patches from Fedora.
* xawtv: Added version 3.102.
* zapping: Tested version 0.10cvs6. Not working.
* zvbi: Added version 0.2.33.
Merge commit 'b1a2671'

Conflicts:
	.gitignore
	config/perl/pmb-install.txt
Merge branch 'master' into anyeventhttpd

Conflicts:
	config/perl/pmb-install.txt
fixed streaming support
relax error count in t-is_probabprime_fermat
fix test for cyclotomic_polynomial
Merge remote branch 'wbhart/trunk' into trunk
Adds list output to qadic/profile.
Fix for the previous commit.
fix sign normalisation issue in gcd_modular
speed up fmpq_poly get/set_coeff tests
reindent and slightly clean up gcd_modular
try dividing by the shorter polynomial first
Merge remote branch 'bill/padic' into padic
make unbalanced divisions nonrecursive in fmpz_poly_divrem
move two incorrectly named files
Small fix in qadic_trace.
Update Makfiles in the padic branch.
Update of qadic_mul.

Reduces the number of modulo operations involved in the qadic
multiplication routine.  This is justified by the assumption
that the coefficients of f(X) are of size p, not p^N.

Also makes some minor modifications to the qadic header.
Adds profiling code for padic and qadic multiplication.
Include algorithm selection for qadic_norm.
make _fmpz_poly_div_divconquer nonrecursive in the unbalanced case
Remove unused variable in qadic/log_rectangular.
Remove duplicate padic dir in BUILD_DIRS.
improved security in grid but still a problem
Upgraded to io.netty:netty:3.5.1.Final. Closes #97
Fix misuse of view param when creating DNSSEC-tools signature
Connection and timeout pages + icons
Page to edit server IP address
- Thumbs
partial implementation of test command
a working unit test, need to use a modified version of munit to get the result printed out
use linux and monodevelop (yoga.xml not correct)
use constructor instead of static function to initialise YogaProject +
add TODOs
clean output (error and messages)
add Setup command to ease the use of yoga (call "yoga" instead of "haxelib run yoga")
make test a prior cycle for install and make sure the test pass
clean comments
forgot to add some files
make it work for yoga itself
use the same reg exp \ \ symbol for project zip
More IRC commands to fuzz
Now with x of y commands progress indication
change project name 'codegen'
process code indent
mv ressource, add more conf ,modify sms/message.py
Merge branch 'master' of https://github.com/sguo/sensei
1.5.0 release
Merged BQL/Relevance fixes made by Baoqiu and Sheng
added external object support in relevance model
Use _zoieSystemMap.keySet instead as the _dataCollectorMap is not populated yet.
Added support for JSONP on the broker api
Push the start offset to the data provider if set after the provider has been built.
setStartingOffset should handle null version case
Old since key was not picked up
fixed bug and added test case
minor fix for comment
fix the package import bug
added sensei plugin integration for external relevance object
added one more test case for senseiplugin integration
fix the bug of _NOW keyword
added bug fix for keyword _NOW
pick up new bobo with BigSegmentedArray count array
fixed the bug that parsedquery could be null when only few data is inserted into sensei
Use 3.1.2-SNAPSHOT of bobo
Merge remote branch 'wonlay/master'
0.0.13

Added mongoose pass thru, example - wongo.mongoose.*

Signed-off-by: Sean Wesenberg <wookets@gmail.com>
Fix render to add custom layout
Remove HTML tags in the report template
Remove default Vanity report CSS
Merge pull request #2 from wopata/fix-dashboard-render

Fix dashboard render
Jason: lot of stuff this time, major pending transaction, rating in pending transaction and past transaction page. add oil guys ^.^
Set correct Content-Type for error messages.
changing permission of getAllApplication(userName)

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131322 a5903396-d722-0410-b921-86c7d4935375
Added service and operation names to stream payload

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131323 a5903396-d722-0410-b921-86c7d4935375
BPS-142 : ht concepts doc

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132672 a5903396-d722-0410-b921-86c7d4935375
Making changes to paths after removing the service folder from p2-profile-gen and distribution folders

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@134024 a5903396-d722-0410-b921-86c7d4935375
modifying url-mapper suffix to localhost for stanalne products

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@135584 a5903396-d722-0410-b921-86c7d4935375
add some characters for get_chs_link function
Small changes to comments etc.
Small changes to comments etc.
Actualizacion2 060912
Actualizacion3 060912
Actualizacion3 060912
Changed to support only Portrait Orientation
llev codi que no utilitz després de \end{document}
- ADD informazioni per la gestione della classe
- DEL eliminazione delle informazioni per la gestione con file xml
Add ZooKeeper connection test
message mode
dev version runs on firefox
SPELL_POWER_CHI, combat icon for target frame [r13]
Use correct 2MSL value
SILENT: fixed typo
Update README.md
Merge branch 'fsm'
Minor changes to docstrings; form->directive is public now.
Fixed example for normalize-transitions.
Fixed normalize-transitions example result.
Cleanup in NFA namespace
Cleanup in DFA namespace.
Fixed reverse-dfa.
Fixed any transition generation in 'generate-fsm-transitions'; added tests for macros.
Update .travis.yml
Made dfa?, nfa?, epsilon-nfa? hierarchy more intuitive. Extracted FSM type validation.
Fixed Hopcroft Minimization.
Since Hopcroft is now reliable and performing well it's the new default algorithm.
swat!
break crm out into pieces like main app.
Get opportunity relations on account.
refactor
swat!
more refactoring.
Add mechanism whether to include attach buttons or not.
exculed already attched records in searches.
Add incidents to account.
Implement AccountBasicInfo.
Get ToDo list on account.
More "basic" models.
Fix problem where errors were getting mangeled by events passing through as options.
Don't want spinner getting in the way of error messages.
Overhaul that separates "info" models into "Relation" and "ListItem" models.
Add project to account.
Merge pull request #191 from jrogelstad/master

Add all of the "related" panels to account. Overhaul some model methodology along the way.
issue #18396: add support to filter address on account
Merge pull request #282 from jrogelstad/18396

issue #18396: add support to filter address on account
looked again at enyo testing
Merge branch 'xtuple'
Merge branch 'xtuple'
currency and item lists and workspaces in setup
finished unit workspace and created three new lists for its three pickers
New icons.
Merge branch 'shackbarth'

Conflicts:
	source/stylesheets/screen.css
etc.
Implement context awareness in fetchRelated.
Merge pull request #200 from jrogelstad/master

Steve's changes and context aware relationship support.
set release branch in deploy
rm some files for old deploy way
let current_user in the top line, and add current_user class
modify production.rb for deploy issue
update choice class
cross browser half way
Merge pull request #7 from busyspider/master

cross-browser half way
fix some bugs for make choice
add delayed job
set mail
add time show
add delayed job config, deploy for delayed job
disable delayed job in development
add setupmail.rb
modify_xutil
NAT するための vlink を別のスイッチに接続
Récupération des chaines
added logo file field to services new view
added simple stack example
added 07 Upgrading to Joomla 3.0 to Warp Docs
set cscope
yuchao add the develop directory
Merge pull request #1 from yuchao86/develop

yuchao add the develop directory
fix with sqlalchemy session
updated fixdotfiles
TRUNK-3309 - Add methods for voiding, unvoiding orders 
TRUNK-3309-1.patch by mvorobey 

git-svn-id: http://svn.openmrs.org/openmrs/trunk@27933 5bac5841-c719-aa4e-b3fe-cce5062f897a
Applying auto format changes

git-svn-id: http://svn.openmrs.org/openmrs/trunk@27935 5bac5841-c719-aa4e-b3fe-cce5062f897a
new post email
Add username filter on User Manager screen.
Use lucene ngram analyzer instead of okapi ngram analyzer
Refactor Security framework.

Remove the SecurityChecker implementation and move back to identity based security checks.
Resolve remaining issues from Security refactoring.
restore deleted files
Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572
Use human-readable file sizes.
AAdded concat, map-indexed functionality
zzs
add by zzs
Improved chapter matches for fi/pi templates
Merge branch 'master' of github.com:zdavatz/ydocx
Added version option to commands
router2 updated
[zr0043] Cleanup
Code formatting
Merge pull request #449 from hintjens/master

Fixed code formatting
phenny: Create a sample config file

Signed-off-by: Qingtang Zhou <qzhou@redhat.com>
Module.startup: Add password verification for UserServ

Signed-off-by: Qingtang Zhou <qzhou@redhat.com>
Added ZnZendFormRow form view helper
Added ZnZendFormTable form view helper
Registered form view helpers
Updated README on form view helpers
[fix] Changed require('util') to require('util') for compatibility with node v0.8
Merge pull request #24 from node-migrator-bot/clean

Hi! I fixed some calls to "sys" for you!
Ready
Merge pull request #133 from ldnigro/B36-2851102

B36-2851102
* perl/Amanda/Recovery/Planner.pm (make_plan_from_filelist): Use the 
  changer inventory to try to use an already available dump.
* server-src/amidxtaped.pl: Pass the changer to make_plan.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4726 a8d146d6-cc15-0410-8900-af154a0219e0
* server-src/find.c: Fix crash when log are corrupted.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4728 a8d146d6-cc15-0410-8900-af154a0219e0
* server-src/amvault.pl: Abort if log file already exists.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4730 a8d146d6-cc15-0410-8900-af154a0219e0
Test_icp: Preallocate valarray before feeding to ComputeMatchingE
replacing deft with org-velocity
new binding for <limit>.
featue checkin
local changes needed to push to remote repo
conflicted
feature 2
gallery & grade done
complete PodManager
Merge branch 'master' of https://100kV@github.com/100kV/GroupOne.git

Conflicts:
	build/classes/TestServlet.class
	src/TestServlet.java
Deleted Back button from VendorAccount page
updated readme license to the correct version
Actually implement 'sandbox-delete'.
Rename the default package environment file.
Comments.
Support the optional 'cabal.config' package environment file.
Remove an unnecessary import.
Actually implement the 'sandbox-init' command.

Additionally, change the search location for the package environment file to the
project directory instead of the sandbox directory.
Add a TODO.
2012/12/21 commit
Update formula template for new X11 dependency

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
atool: no longer requires gnu-sed

Fixes #13151.
ascii 3.11

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
atf 0.15

Upgrade atf to version 0.15.
Change to the new homepage because the old `homepage` redirects.
Change the `url` to googlecode according to the `homepage`.
Remove the `--mandir` because it work correctly now.
Add `ENV.j1` and a separate `make install` step to stop a race
condition when brewing with llvm where a file is claimed to exist.
Tested on Lion using clang and llvm from XCode-4.3.3.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
fiwalk: update download location

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
httrack 3.46.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
scm-manager 1.17

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
libstfl 0.22

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Cache Hardware.is_64_bit?

IO#popen is called for each call to Hardware.is_64_bit?; this becomes
costly when it is repeatedly invoked. Luckily it is an invariant, so we
can store it in a class variable.

False is a valid value for this method, so the usual ||= idiom is not
applicable.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
6/13 update
Updates the README for help about invoking script
YT embedding fix. Close #15
nanndemonai
Clean up on example config
Reporting for Advertisement (views, unique views and hits)
Add the -n option to the Intent start Command, so it works. Tested on Galaxy Ace CM7.2 and Galaxy Nexus CM10
Bugfix + compatible IE8+
modify vaccination index
Added ' to the decoder.

Song Info Window shows in the center of the Hanasu window. It also has a buy Album button.

YesAsia will fix the rare ocasion of mix-matched Track/Artist. It also grabs the Buy Album link.
Started work on the friends feature.
Merge pull request #1 from Amrykid/master

IL Dictionary implemented / NuGet issues probably fixed Fixes Issue #1
Updated Crystal, Starting work on the rest of the tidbits then on the core
Merge pull request #2 from Amrykid/master

Fixed nuget
imaging: Automatically generate boot menu

When a image or master is added to a computer or imaging boot menu,
no need to click on "Generate menu" button anymore.
imaging: Recursive removal of masters

Add a "select/unselect all checkboxes"
Clean code and remove debug infos
Added option to sendMail that allows specifying additional headers
Stuck on weird SEGFAULT
Cleaned up awesome theme
renamed folder. gui still same
actually max
patch pour les query has_child
Logout works. Just link to this using <a href>
Update HotShow.ahk

Changed call to non-existent function "Download()" to native function "UrlDownloadToFile".
Update test/DAL.h
Adding commands base... will add a bunch more later
Adding logging.
Fixed a bug in setting up the initial state of the tab containers
Updated build
Add graphics and more game logic
added title to pages and footer div to about.html
Implemented EditItemController
Merge pull request #80 from CS340Group/murphy

Implemented EditItemController
Added from CentOSVM version 6.3, and it is the tools directory
and I am using vi.
Take out key,value length check, KVMessage already check them
refactor on view and infowindow model
Merge branch 'master' of github.com:CartoDB/cdb.js
Merge branch 'master' of github.com:CartoDB/cdb.js
added ComeToFrontBrick to parser
SetSizeToBrick + new scaling mechanism
remove debug-NSLog
merged into master :)
Template engine.

Very rough implementation of a new template engine for themes.
Requires optimization and is not complete. Only supports main
log line rendering. Inline media, links, and other stuff do not
work yet. Use at your own risk.
improve help information
Merge branch 'master' of github.com:Cofyc/argparse
Deleting practice commit
added post capability to get_observation and describe_sensor requests
修复文章列表的 Bug
adding image saving and correcting a small issue with category controller
added regular page functionality
Fixed a copy paste error in one of the unit tests for the invite command.
Clean up doghshell user input.

- python 2 friendly sys out
- python 2/3 friendly input
- don't crash if wrong letter is typed.
Remove pull_all/show_all dog commands.

- until the api supports it
- issue #12
adding keyboard reader
Added start of C parser.
adds railsrc
meta_file
Simulator integrated
Added a palindrome checker
Remove kde-misc/oxygen-appmenu
Add kde-misc/kded-appmenu
Citramona support
mach-citramona.c added in patch
read ethernet mac address from eeprom and set on interface
Reset skb_free_idx on ifconfig eth0 up.
Patch for: FTBFS with GCC-4.7
Merge remote-tracking branch 'upstream/master'
Order of xset s off and xset -dpms matters.  Remove redundant comments
Update Co->Lunchbox version table
a lot of commits
a lot of commits
Merge pull request #109 from ssikka/master

new changes
Comments~
debug: Crash si l'action du topic n'existe pas.
game actions stub
Made real gui working
Now with a main menu, and highscore handling!
hopefully importing testproject works now
sdfnjisdnhjisdvd
Reogranisation
add a new redis set subnet:number which store the subnet with the same first octet
Added links to examples (imaging.py module documentation)
Add JSON Text instance for (de)serializing Text strings

Add a Data.Text JSON instance to make it possible to serialize and
deserialize data types containing Data.Text strings.

Currently only Strings are supported which makes it cumbersome to use
Data.Text strings together with the json library.

This change adds a dependency to the 'text' library which is nowadays
considered stable & the de facto way to work with unicode strings.
Bump version number.
Ran interpreter twice over valve3.def. Array values updated correctly.
Modified Makefile to include debug info in interpret.exe. Debugged using: gdb -tui interpret.exe
Fixed the lexical problem where 'a[x]' was getting scaned as a variable (VAR). See change to valve.l for fix.
.project und .cproject war falsch, da wget mit github irgendwie Unfug ergibt
.project.1 gelöscht, da gedit suckt und Dinge erstellt, die es nicht soll
add kernel sourcecode

Change-Id: I031be2a9a7642aba34e618b62408d63658ea78c3
fix screenshot uploading
First simple server-daemon
fix start/restart problem
fix start/restart
Update README.md

link don't works
Merge pull request #5 from GianArb/gh-pages

link into readme
the game bitches
MAJ gdal data 2/2
PluginDownloader: Enable threading.
PluginDownloader: Remove debug output.
Misc: Fix encoding issue with translations using non-ascii characters in @version string.
Math: Add cbrt() function
Merge pull request #362 from nyuszika7h/progval-testing

Math: Add cbrt() function
Fix install (version file) when the source has not been downloaded with Git.
Topic: Add save command. Closes GH-332.

I committed this already earlier, but that commit was lost somewhere.
It doesn't seem to be in any branch, I suspect I might have reset my
testing branch or something later, or I don't know.
Merge pull request #363 from nyuszika7h/progval-testing

Topic: Add save command. Closes GH-332.
Channel: Perform proper capability checks in devoice.

Closes: Sf#3524393
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	plugins/Channel/plugin.py
Just create schedule.schedule/drivers.Twisted.poller without any guard

These module-level variables had historically been created such that reloading
the module wouldn't redefine the variable.  However, none of our code reloads
the modules and the guard to prevent redefining the variable was broken so it
would've been redefined anyway.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	src/schedule.py
registry: Use the correct variable name setName creates the child entry

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	src/registry.py
Add a test to verify the nick converter honors strictRfc

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
Success: Allow the plugin to be loaded from a query

Closes: Sf#3513915
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	plugins/Success/plugin.py
Merge branch 'testing' of github.com:ProgVal/Limnoria into testing
README.md: make LICENSE link portable & add IRC links.
Merge pull request #365 from Mkaysi/README

README: add IRC links and make LICENSE link independ from GitHub
use max9924 to replace ncv1124, add narrow band oxygen sensor differential input circuit, put all component into PCB edge
make new footprint for max9924 & lm9040, add can bus interface, generate new netlist
setup PCB design rules, ajust shape size & pad drill of some components
finish layout of cpu core circuit, push all components of I/O circuits into right position, make a rough wire connection on them
revise schema according to Jaguar & Ravage project, eliminate as many errors as possible which were inherited from Puma board. Remove VSS interface, narrow band O2 interface, AC relay output, AC signal input. Make fuel injection configurable which can be batch fired or semi sequential fired
add hardware specs to README.md
format README.md
correct literal error
make new footprint for screw connector, redesign ignition gnd & all lowside gnd
remove previous unnecessary sch & brd file
revise schema according to DeuceEFI's claim
some layout work, very dirty
layout work, make some progress
finish all the net connections, requirt further ajustment
swap ignition chip for better PCB layout, some PCB layout work, add some zones for ignition and low side
Heavily revise the ADC gnd, relayout gnd, power and ignition net
submit my board to manufactory
Merge branch 'experiment'
Iniciado os tutoriais/prototipos com o primeiro tutorial
Added shoulda and updated spec files
Added Basica Network and Role specs
Fix for r20 tools
Merge branch 'master' of git://github.com/alexander-yakushev/neko
Portal scene refactoring. Moved all assets to cloud.
mygale become just AOP
Song loader fix
consolidated video_stats

Summary:
This is the backend part of the effort to revamp the video stats dashboard.
It includes
* consolidated video stats generation for different duration: day, week, month
* topic level aggregation

Test Plan: ran on my hive cluster

Reviewers: jace, benkomalo

Reviewed By: benkomalo

Differential Revision: http://phabricator.khanacademy.org/D695
separate out base classes from Series and SeriesView backbone classes to add more series types (eg. retention, % correct)

Summary:
These base classes are pretty generic and can be reused for Ben
Komalo's video stuff too if he wants.

Test Plan: manually

Reviewers: benkomalo

Reviewed By: benkomalo

CC: jace, tom, yunfangjuan

Differential Revision: http://phabricator.khanacademy.org/D311
Updated README to reflect switch to poisson distribution.

Reviewers: david

Reviewed By: david

Differential Revision: http://phabricator.khanacademy.org/D631
Fix sys -> util
Remove unnecessary throw
testsssss
Merge branch 'master' of github.com:Laura021/Vilib
buscar por departamentoss
bug 731022 replace prefixed css with unprefixed
Merge pull request #423 from Lonnen/731022

bug 731022 replace prefixed css with unprefixed
Merge pull request #411 from ossreleasefeed/bug731548-improve-report-index-rendering

added some additional classes and css styles to avoid FOUC fixes bug 731548
whitespace and tabulation fixes
Merge pull request #413 from ossreleasefeed/bugXXXXXX-change-verion-to-version

changed byverion to byversion
setting crashed_thread to -1 if there was no identified crashing thread fixes bug 528578
Merge pull request #412 from ossreleasefeed/bug528578-improperly-identified-crashing-thread

setting crashed_thread to -1 if there was no identified crashing thread fixes bug 528578
provide three additional options to submit crashes to core, plugins and toolkit fixes bug 680974
Merge pull request #409 from ossreleasefeed/improve-layout-adu-by-type-732402

fixes to legend and adu controls to improve layout fixes bug 732402
Merge pull request #415 from ossreleasefeed/bug680974-improve-report-this-link

provide three additional options to submit crashes to core, plugins and toolkit fixes bug 680974
fix style of report/index tables to match rest of socorro fixes bug 731571
Merge pull request #410 from ossreleasefeed/bug731571-report-index-tbls-style

fix style of report/index tables to match rest of socorro fixes bug 731571
docs only - make install docs less misleading
Merge pull request #425 from rhelmer/less-misleading-install-docs

(docs only) less misleading install docs
Merge pull request #426 from jberkus/master

2.5.1 database changes
Added 2.5.0.1 for fix to backfill on Produciton due to broken OS_version information.  Fixed issues with upgrade script for 2.5.1.
Merge pull request #427 from jberkus/master

2.5.0.1 Database Fix
docs only - suggest using release tag
Merge pull request #429 from rhelmer/master

docs only - suggest using release tag
bug 733931 - update crontab example
ran the cucumber & rspec generators
correzzioni varie