labofsahil/github-event-dataset-2012 huggingface dataset:
SegmentComputerFunctors (concept + refactoring) / MostCentered (using SaturatedSegmentation and circulators) / adding '++' modes in SaturatedSegmentation to ease the segmentation of subranges
Merge branch 'master' of https://github.com/DGtal-team/DGtal into MostCenteredEstimator
Merge branch 'MostCenteredEstimator' of github.com:troussil/DGtal into MostCentered
curvature, normal, tangent from GeometricalDCA
 new example: curvature by MDCAs
 distance estimation of points to separating circles
 renaming, minor changes and doc struct/methods updated in SegmentComputerFunctors
doc updated in SaturatedSegmentation about modes
 minor changes in SegmentComputerFunctors
fix
 segment computer functors are now segment computer estimators and are models of CSegmentComputerEstimator, which is refinement of CLocalGeometricEstimator
cleaning
new CGlobalCurveGeometricEstimator concept
 cleaning local estimators + test of the estimators comparator in a separate file
bug fix at the end of the MostCenteredEstimator algorithm
New specialization structure for simplematrix (less code redudancy), inverse method added (WIP)
New specialization structure for simplematrix (less code redudancy), inverse method added (WIP)
New specialization structure for simplematrix (less code redudancy), inverse method added (WIP)
Tracking a bug in the inverse...
1x1 specialization...just in case...
php colorscheme. ctrlp remapping.
SSL no verify...danger danger
deleted unused zip
updated pubspec ref to point to bot.dart/working
Readme

Added readme.txt
Add begin-expression
geometry -> geom
geometry -> geom
moved grid functions to init or geom. removed grid module
Merge branch '2.0' into simpledemo2.0
adapted bump_debug to latest changes in 2.0
Added additional socket cleanup at exit
Fixed LLVM function attribute handling.

Previously, set_param_attrs would overwrite any pre-existing
attributes, which is problematic, as per-function attributes are
also stored in a slot in that attribute list. This for example
lead to "noinline" being dropped for functions with inline asm.
Re-enable inlining by default for -O2 and above.

This fixes a bug introduced in 2f78dc686.

Thanks to Jernej (jerro) for the fix!
logging exception on json.loads() failure reading a queue.
make 'force' flag work with multiprocess configuration. checking in 'force' URLs to seen table. provisional code for showing the version of job configuration. support config option for disable use of FPSortingQueueFileReader.
Merge branch 'master' of github.com:kngenie/crawlhq
fixed errors after merge
Added a gesture hash list. Not included in any functionality yet (that's next).
README.md is to explain how we did it (magic) and mostly there to remind me.
# better app root
New version of daGloane HW.
- There is almost no current consumption when turned off. Its not necessary to disconnect battery anymore.
Allow to override the target host

Also add command line parser, add usage text, etc.
Align db fields more closely with user object
Fix news feed sliding on map clicks
Save submitted stories to db, fill news feed with saved stories (no filters)
Added difference entropy
grunt 0.3.17 is pickier about jslint. This should fix failing build
Or Assumption implemented.
Scanner funcionando 99.9%
defconfig: sync with upstream
sound/soc: I777 patches for micswap
Merge pull request #1 from ktvoelker/master

New ideas
Major refactor, allowing installation ease

Allows for automatic installation with primary binary containing almost
nothing, except the path.

Also continues trend of pushing all functionality into functions. This
appears cleaner to me.
Create install script for homebrew users, others
Strike out implemented idea: better lib loading
Remove completed lib idea from Ideas
Move to a better method of picking up modes

No need to explicitly list them if we can just list the directory. This
also makes it easier to add new ones.
Add other misc files to the install

We will need the example conf for a planned mode. Adding the License
just seems like a good idea.
Move brew formula to 0.4
Fix silly error in install script, add uninstall
Correct typo in install script
Implement idea to "save" data from prior instance
Add better defined reload method, colors

Reloading old data can now be done via a mode. Also, init outputs
messages in color for better readablity.
Switch HEAD url to https, per brew best practices
New idea for mode; schema
Make init follow symlinks
Fix typo
/ ‘Genel/test89.txt.txt’
余分なSCSSファイルを削除
INdentConsistencyCop with .gitignores
Addition of Readme File
new portfolio
new portfolio2
Fixed banner bug. Changed license from GPL to proper open license.
test commit.
+ACM Please enter the commit message for your changes. Lines starting
+ACM with '+ACM' will be ignored, and an empty message aborts the commit.
+ACM
+ACM Committer: +AOwAggCsAOsAngCRAOwAsgCcAOwAggCs +ADw-la880703+AEA-JeenHee.local+AD4
+ACM
+ACM On branch master
+ACM Changes to be committed:
+ACM   (use +ACI-git reset HEAD +ADw-file+AD4...+ACI to unstage)
+ACM
+ACM	new file:   test.txt
+ACM
jhvdasbsjdasdas angular 1
modify MSG

MSG modify
Support implicit sectioned caching using :: syntax.
More work on sectionable caches.
require_once on error class.
Merge pull request #509 from cviebrock/section-append

Make Section::append public, and do a true append. Other methods are renamed but unchanged.
Added preserve option to File::rmdir.
Corrected typos in the comments.

Signed-off-by: Pavel <proger.xp@gmail.com>
Merge pull request #546 from ProgerXP/patch-typos

Corrected typos in the comments.
add response to done event.
Merge branch 'master' of github.com:laravel/laravel
fix conflicts.
Merge branch 'staging' of github.com:laravel/laravel into staging
Merge branch 'develop' of github.com:laravel/laravel into develop
Add the possibility to create occurrence with instance and Uid
Truecrypt package
Fonts in new puppet style
Ruby configs in Puppet
Uninstall solarized
Unistall oh-my-zsh
Reinstall oh-my-zsh
Reinstall solarized
Add terminal manifests
Uninstall solarized again
Terminal theme configured
Terminal ready
Puppetize tmux configs
Update commit message
The everything in ch6 done
Moved view init logic to viewDidLoad method of controllers.
initial merge of curview project viewer, updated libraries, and example data files
resolve conflict
Merge pull request #1 from leon9/current

Current
Agregado un contenedor con fondo para colocar imagenes de fondo.

Agregado content como plantilla de los demas sitios.
Plantilla de contenido
Moved all the static stuff to the public/ dir
Cambios en el css.

Se agrego informacion.html como template para los demas sitios.

Se hicieron cambios en el index.html.
Cambios en el css.
Merge https://github.com/hsmty/hsmty-web into current
finished assignment 1 and made revisions to example assignment
zshrc change.
better prefix detection
configure for cppunit
build unit tests when cppunit is available
make PHP again
order tests into logical groups
updated .gitignore for automake
Merge branch 'master' of https://github.com/libMesh/libmesh
indexer: don't segfault when freeing an unused indexer

Make sure that idx->pack isn't NULL before trying to free resources
under it.
http: increase buffer side to deal with side-band-64k

This poor transport was forgotten in the recent sideband support.
indexer: kill git_indexer_stats.data_received

It's not really needed with the current code as we have EOS and the
sideband's flush to tell us we're done.

Keep the distinction between processed and received objects.
agregadas las margenes
prints RateLimit
Merge branch 'master' of github.com:limitusus/twdel
add the sidebar section back
rewrite cart class's add method
modified layout
merged base
changed the header image
Merge branch 'master' of github.com:weWeb/warlords
shows self stats when viewing other profiles
changing layout
changed sidebar bg image
Attack is semi working. algorithms are primitive
Merge branch 'master' of github.com:weWeb/warlords
Merged with trunk
reverting master before implementing army
fix not to check removed hosts with stocked bricks
Added support for specifying a config file name at the console
Merge branch 'edge' into multiconfig
Config.cpp was not receiving console commands properly. Other bug fixes to do with loading a specific file from sd.
Merge pull request #15 from logxen/multiconfig

Multiconfig
Timer checks and fixes
Algunas funciones de fecha en un helper
Script de creacion actualizado y otros.

Tablas alteradas: banco y grado_academico
.htaccess para evitar index.php en rutas
Opciones de configuracion por defecto
Nuevo archivo con datos de tablas

Modificacion en tabla Zona y archivo con datos de tablas base.
Track latest bash_completion, and source it.

As an aside though, why are all the versions of Bash I have here on Windows so
ancient?
Get rid of C++ main function; add some beginning lua display API
Moving over to new draw types; going to do parsing code fixups next
Added new fireball sprite for mages; added new enemy to replace the quite-annoying (and too-easy-for-teams) Krell; buffed archer spell; buffed long bow
More include removals and directory cleaning. So many errors now
Bugfix: ztex: Include --scan-serial option even for ztex-only builds, so it can be used to disable autodetect if needed
complete file output
Set version 1.2
fixed bug #11
fixed bug #22
fixed bug #24
Changed the Update XML format: Replaced element "critical" by "latestcritical" and added a "version" attribute to "what's new" items
Implemeting nested if-else in HybridEngine class
Implemeting nested if-else in HybridEngine class. Added new test cases
Fixed bug #25
Updated changelog
add a couple of lines to readme
Update perl-sys-statistics-linux to 0.66
Update eid-mw to 4.0.2-1188
Update sems to 1.4.3
Archives some packages
Delete some old files
Improvments on asterisk-lts package (cf. asterisk package
Mention Melpa in README
Abandoning connection based circuitry for tile-event approach (before project added)
Added mem_trimsz for mallopt config.
Set upstream req to NULL when take_ownership is on
Free request if passthrough enabled.
Logging updates, potential doublewrite fix.
jfkdajfls
Fix for double write, hopefully.
jfklda
jfklda
jflkdsa
removed x509 verify logging for now.
Fixed up file logging.
implement WorldStateMgr - some speedups, cleanups, compile fix (thx to softbest). no changes in general.
[mr2052]Spell handling for some spells in malygos encounter
[mr2053] always use the radius in Spell::DoSummonWild with dest target.
With that we have a better random Spawn and Spells like 56429 works good.
[mr2054] Hack of Spell 56046. Set a duration for cancel the channelvisual after a specific time.
FS corrects
[mr2055] implement and use Unit::IsFalling() method; Make MotionMaster::MoveWithSpeed fully correct instead of Unit:: version. try repeat Blizz charge bug (related to #897, testing).
[mr2056] revert part of 11993 for fixup spell targeting. big thx to rochu && Inquisitor. testing. related to #1010 && #1057
[mr2057] fix crush in SpellArea::IsFitToRequirements (after mr2035, 12017, 12019). thx to Undergarun for reporting.
[mr2058] verbosity in define some HitInfo. from TC mostly.
[mr2059] tru fixuf HITINFO_ABSORB/HITINFO_RESIST usage. arso add rage storage to DamageInfo structure.
[mr2060] special diminishing rule for Earthgrab (Storm, Earth and Fire). testing. related to #1056
[mr2061] try fix custom proc for Earthliving HoT with Blessing of the Eternals talent. testing, related to #1037
[mr2062] define SPELL_ATTR_EX6_IGNORE_DETECTION v0.3, need test. related to #705
[12024] Fix Targetpair (87, 8) to use TARGET_FLAG_DEST_LOCATION

Note: It seems that atm a bunch of spells are broken, that had seem to work before.
There will follow up a few more changes to spell targeting, so please report issues you find.

Conflicts:

	src/game/Spell.cpp
Merge branch 'master' into testing
more correct removing SPELL_AURA_MOUNTED while enter vehicle, close #1061. also correct vehicle dismiss while player logout.
[mr2143] continue LFG-Rewrite
Update src/game/WorldSocket.cpp

fix LockIP detection, thx to koksneo
Removed Buffer check.
Changed modules var into function arg.
Wire up to Twitter, style markers
Merge branch 'twitter' of github.com:mapbox/map-site into twitter
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'upstream/master'
Remove the extra multi environment monitoring attribute from the client.rb
The actual multi_environment_monitoring attribute shouldn't be a string

It was bool before my server multi_environment_monitoring merges.  No
need to break stuff for no real reason
Fix description and add Oracle to the metadata
Merge pull request #54 from tas50/COOK-1880

Cook 1880: Remove duplicate attribute and set the attribute back to being a bool
Merge pull request #55 from tas50/COOK-1881

Cook 1881: Add Oracle to the Nagios metadata
Merge branch 'master', remote-tracking branch 'upstream/master'
Load event handlers from a new nagios_eventhandlers databag and pass them to the commands template
Add event handlers from the data bag to the commands template
Add a new value to the service definitions for event handlers
General Readme cleanup
Add event handlers section to the Nagios Readme
Fix use of value_for_platform_family
Merge pull request #58 from tas50/COOK-1887

Cook 1887: Fix use of value_for_platform_family
Merge branch 'master', remote-tracking branch 'upstream/master'
add name attribute to metadata
Remove an errant 'w'
Merge remote-tracking branch 'upstream/master'
#1018 pass in 'this' reference to onMouseDown
Fixes #911 - Researched ModifyRule.js as bug instructinos and
discovered we did have a bug, which I fixed.
Make sure selection chrome gets updated after changing device
orientation.
Fix tree smart input for legacy trees (#3422)

Query was wrong for legacy case.
Merge branch 'master' of github.com:maqetta/maqetta into reviewBranch
clean up AMD deps
Merge branch 'master' of github.com:maqetta/maqetta

* 'master' of github.com:maqetta/maqetta:
  #1949 single user patch
Fixes #1938 added missing props
Various minor updates to docs
Merge branch 'master' of github.com:maqetta/maqetta
Add-Migration modify_BillMaster_Lock
修改分拣主单页面
Signed-off-by: zxl <loou@vip.qq.com>
Add-Migration modify_inBillAllot_UnitCode
Add-Migration modify_outBillAllot_UnitCode
Merge remote-tracking branch 'thok-zxl/master'
Merge remote-tracking branch 'thok-wyl/master'
库存总账界面
Signed-off-by: Endis <369029432@qq.com>
Add-Migration add_deliver
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
修改错误提示页面；
Merge remote-tracking branch 'thok-wyl/master'
Merge remote-tracking branch 'thok-zzb/master'

Conflicts:
	code/Authority/Wms/Controllers/Wms/Inventory/DailyBalanceController.cs
添加分拣线，下限，调度表结构，修改订单数量结构
Signed-off-by: zxl <loou@vip.qq.com>
Merge remote-tracking branch 'thok-zxl/master'
新增异步处理（长连接交互）；
Add-Migration add_sort_table
Merge remote-tracking branch 'origin/master'
修改入库分配，使用长连接，异步执行，实时进度条显示；
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Alteração na classe ContratoVO para uso no relatório de extrato do cliente
Unmarshall with bson4jackson decoder
Change Unmarshaller to handle bson (bytes)
Marshall with bson4jackson
Exclude jackson deps from bson4jackson
Merge branch 'master' into dev/bson

Conflicts:
	src/main/java/org/jongo/MongoCollection.java
	src/main/java/org/jongo/Save.java
	src/main/java/org/jongo/marshall/Unmarshaller.java
	src/main/java/org/jongo/marshall/jackson/JacksonProcessor.java
	src/test/java/org/jongo/SaveTest.java
Move setDocumentGeneratedId into Marshaller
Add Encoder and refactor false negative tests
Replace bytes[] and offset with DocumentStream
Use driver instead of marshaller for primitive types
Remove unmarshall from LazyDocumentStream
Rename decoder package to stream
Remove JsonModule
Create ObjectIdFieldLocator to find ObjectId field
Polish marshalling classes name and visibility
Add Caliper benchmarks on encoder and decoder
Add BsonTimestamp and min max key support
Merge pull request #42 from mark1ewis/master

ObjectReader/ObjectWriter customization in JacksonProcrssor
arrange last pull request commit
arrange last pull request commit
Add JsonCompatibilitySuite (no stream)
Updated WinMaker.  Renamed icon1.ico to generic.ico.
Fixed icon from not showing in titlebar
psd files checkin
Updates to zsh modularity
Controller Etablissement + modif fun get My_model
bug simplificar + optimizacion
added working stockist page
pymavlink: fixed longitude in mavtogpx.py
Mark non-serializable attributes transient.
Just a few visual tweaks
forth Hello World
nasm gitignore
Revert "edited gitignore"

This reverts commit da5af76113e71fb7e153eac3fc3b8cfe343e34c0.
Revert "Revert "edited gitignore""

This reverts commit b59c81bcfb4ac466b2dd8c059880847153aea44c.
Oops, its by id asjdalsjkdlkj now I need to redo since cbf cloning and squashing.
UserController: log username on delete
CategoryController et al: add active flag and implement category delete with it (closes #12)
getData now returns callback(err) if there is an error
Merge fix
Updated DB
Removed Testdb
Fixed Testdb
Finished log in and sign up pages
updated IS1 Node with calibration functionality
last state before krank
add project IS1
adding sql scripts for workitem/audit matching cleanup
updated with statement to gather all affected audits only
added more search statements to determine the overlap issues
updates to check workitem contexts
added epm document stats from ddms 9.1 - to be updated
updated ddms status/info
updated stats with baseline data
updated ddms status checks
Merge branch 'develop'
prevent abnormally large loglevels from overflowing gen_logmask()
bumped changelog
Merge branch 'release/2.4.2'
Merge branch 'release/2.4.3'

Conflicts:
	CHANGES.md
Merge branch 'release/2.4.4'
Merge branch 'develop'
revert name of composer repo for compatability with dependent submodules
update gem's homepage
reflect actual development dependancies
remove whitespace
Specs for calculating md5
Calculate md5 headers for all request types
remove whitespace
spec for not creating date just by reading the headers
fix date getting set when it shouldn't
extract signatures_match into its own method
failing specs for verifying md5
validate md5 when checking if a request is authentic
change valid_md5? to md5_mismatch? to better reflect the fact that md5 isn't nessisarily present
there should be no md5 mismatch if there is no md5 header provided
Merge pull request #7 from kjg/content-md5

Content md5
GNURADIO_COMPONENTS should now be selectable using paludis syntax.
Add small tool to run w3c validator on local pages before deployment
Fix link for ukranian
Updated global readme and bigint-increment readme. Renamed bignum-arithmetic to bigint-arithmetic.
converted spaces to tab; moved functions around; passed dnt900_driver instead of spi_device
added code for receiving and dispersing data from remotes
Some good fixes
initial commit of my gadgets
add readme
Mock: Add test to cover run_on_instance method
Error portatil
Change objects references.
fix to ERRAI-319 https://issues.jboss.org/browse/ERRAI-310
do not continue sending broadcasts if nobody is listening
Setting up the pages for this weeks assignments
Use port 8888 (8080 is typically already used)
Wrapped html js inside a Immediately-Invoked Function Expression (IIFE)
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	server.js
Add copyright license.
Moves project colors to src/graph/
Fix super() on generic views.
Merge branch 'feature/knockout-refactor' of https://github.com/milimetric/limn into feature/knockout-refactor
Fixes date comparisons in Query.
hack fix missed files
examples/dataflow: structuring test
Add missing packaging files from launchpad.
Pridaný štýl podpisu.
Pridané odkazy.
Pridaná trieda "me" pre vlastné komentáre.
Pridané farebné pruhy na rozlíšenie hĺbky komentárov.
Zjednotené medzery v diskusii.
Pridaná podpora zvýraznenia vlastných a nových príspevkov.
Preparations for date hashtags

Adding ref to every date, so it can be referenced later and getting
whole entry into formating helper function so it can theoretically
use date of each entry to reference others.
Update piplmesh/frontend/static/piplmesh/js/home.js
merge
weeeekend
merge
weekend
merge after weekend
Thread problem
reset
merge eith timo
multi threaded communication and nodes add
update rvmrc to 1.9.3-p286 and update gemfile
grumble: port fix for pre-1.2.4 clients receiving Opus warnings unintentionally.
Added Ava.
[CMake] Generate liblwgeom.h in binary directory instead of the source tree. Propagate locate of liblwgeom.h as include_directories set from toplevel. Report PostGIS version. Tidy up.
added a new file in a branch
-Updated Highcharts version to 2.2.5
-Laid more infrastructure for getting actual data on the chart.
-Changed the functiosn that got indix lists for fields into the resulting list (since they never changed)
-Added an 'xySelector' designed specifically for use with scatter/timeline, though this might be useful for histogram with extra processing.
Merge branch 'hotfix/2012-12-27-md'
--
Merge branch 'master' into develop
moved require to smeargle
Remove `*` border-box and tag it on applicable item
clearer calculate updates function
Merge pull request #306 from modilabs/abstract_parser

clearer calculate updates function
add distinct as parameter
add distinct show call and docs, half of #341, fixup tests
change distinct to return list per Mongo implemention, not applicable to summary, closes #341
Merge pull request #367 from modilabs/distinct

Distinct
Simple bootstrap-based UI
Signed-off-by: unknown <Kimjw@Kimjw-PC.(none)>
Signed-off-by: mongkie <Kimjw@Kimjw-PC.(none)>
Making an explicit map_reduce#inspect. Adding map_reduce#execute
Merge pull request #2265 from icambron/map_reduce_lazy

More intuitive map_reduce laziness
add ResourceCache
added method to get distance
added Vagrant script for local test environment.
added cargo configuration for test deployment.
added maven-eclipse-plugin config.
pythonbrew -> virtualenvwrapper に変更
removed mark-rect
kdevelop*-git: using Release CMake configuration, removed other flags.
kdevelop-ruby-git: removed patch, as it is no longer needed.

Leaving the `git checkout .` here for some time command to revert
remaining trails of the patch.
blender-svn: updated upstream
Merge branch 'blender-svn-upstream'

Conflicts:
	blender-svn/PKGBUILD
blender-freestyle-svn: updated from upstream package
Removed quanta-git, as it is dead.
more schematic details
Sort tag code constants alphabetically.
Rename foreign key fields.
Fix bug with pruning unnecessary continues
Changed owner from josh to breakpad_rw, created language plperl. This fixes the DB creation in a local VM.
docs-only : updated function reference with new and deprecated functions
Merge pull request #441 from jberkus/master

2.5.2 database changes
Added reviewer scores table (bug 739428)
bump receipts with kumar logging
Revert "making it up because @cvan said so"

This reverts commit 6ed21a49d200d600ac4a1730b7036daa812317a1.
Bump amo-validator (bug 776017)
squish bug harassing entomologist
Fixed test to use correct email
Merge pull request #458 from jrconlin/789288.mkt

Fixed test to use correct email
Keep settings with project.
fix unclosed tag that crapped out the footer (bug 760017)
use #after instead of retry to place nicely with celluloid
Added another Resque compatibility helper #enqueue_to
Overrule the queue name when loading the job for processing
Fixed bug in queue setting
Added method for testing with perform_in_queue
Merge branch 'master' of https://github.com/mperham/sidekiq

Conflicts:
	lib/sidekiq/processor.rb
Merge https://github.com/mperham/sidekiq

Conflicts:
	lib/sidekiq/processor.rb
Added tests for perform_in_queue method on worker and enqueue_at on client
Removed queue setting from processor
Merge branch 'master' of https://github.com/mperham/sidekiq
Merge pull request #295 from AutoUncle/master

Added another Resque compatibility helper #enqueue_to
Removed pyflakes vim plugin.
add setSource
Merge branch 'ray' of git://github.com/gero3/three.js into dev
Ray setSource() to set()
Officially record the pronunciation.

Longue vie à Toupie.
Re-enable device_free

It had a short-circuit `return 0;` at the top while testing.
This has now been removed.
add debug to mpi
Squash into me.
Squash me
(Search) Better unit test coverage. Added mocha 'grep' ability to Jakefile. Re-organized reindexing rules a bit in APIs.
[engine] Rename executor to task_lib to make purpose clear.
[engine] Skeleton files for basic executors.
Add a new script to perform a 'merging rebase'

We introduced the concept of a 'rebasing merge' earlier, which simply
meant that in addition to rebasing all of our commits on top of
git.git's 'next' branch, we also performed a merge with the previous
state of the current branch using the 'ours' strategy, so that things
still would fast-forward.

This approach has quite a few shortcomings, not the least of which are:
it is hard to find the commits that need to be rebased (because of the
merge, all previous versions of the commits are part of the history),
and we could not take advantage of rebase's --autosquash option.

Instead, let's perform the merge with the 'ours' strategy _before_
applying all the patches.

That way, the commits to be rebased in the future can be obtained using
the commit range <merge>.. where <merge> is simply the most recent start
of a merging rebase.

Since the introduction of the 'exec' command (thanks Matthieu Moy), the
implementation is very easy: we only have to inject two commands at the
start of the edit script to initialize the merging rebase.

There is a cunning hack in the script to make use of previous rebasing
merges (as opposed to merging rebases): we now require a single commit
as base for use by 'git rebase -i'. Since the rebasing merges only
provide a pair of bases, not a single base, we make a throw-away merge
commit combining those two bases into a single one.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
more unread stuff
#147 made hibernate dependencies optional in OSGI manifest
#250 improved dialect detection
Add a longer timeout to requests from boundaries.py
Add an alternative script to all admin boundaries in each admin level
deck changes
Merge branch 'core' of github.com:mytcg/GameCards into core
first commit
Updated README.md
Some changes
Merge!
Merge remote-tracking branch 'origin/dev' into dev
소스최적화 : frame.php comment.php comment_change.php 통합
python code for bulk copy in postgres
block execute
change convert
implement interpreter mode but []
Fix a minor bug in the buttons
Changed the deployment directory to root
add material/skin functions
getAlphalevels corrected
Conspiracy fix - Removed returning values from void functions - Closes #428
Merge pull request #429 from shamanas/conspiracy

Conspiracy fix - Removed returned values from void functions
Support 'CustomPkg' in .use files. Closes #492
Now only need to change the new
Renamed compiled metagrammar file.
attr2
Add force arg to delete function
new i3 .xinitrc, separated wmii .xinitrc
tests: add tests for --variable
Enabled the query output for all queries in our Cypher documentation
Merge pull request #463 from systay/enabled-query-output

Enabled the query output for all queries in our Cypher documentation
Placebo Transaction behavior

* no longer cached by InternalAbstractGraphDatabase
* tx.success in UniqueNodeFactory
* cypher: #681 transaction commit and failure handling now both in CommitPipe
Merge pull request #687 from jexp/placebo_tx_handling

Placebo Transaction behavior
added setUnique Option for the "addNodeToIndex" command
updated ant file
- Added svn:eol-style=native property on some recently added text files.
- Renamed upgrade_svn16517.sql to the correct SVN revision it was added in (r16518).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16614 54d463be-8e91-2dee-dedb-b68131a5f0ec
Close all databases after installing an update.
added flash messages and reddis sessions
Decided that streaming support doesn't really make a lot of sense for my use case, so I am canning it.

I mean, when you read in a file from an MPQ, when are you really
expecting to use less than the whole file?  Further, a lot of my uses
require parsing of serialized data, which requires you to parse the
whole file anyways.
dodane logo do faktur pdf
trocando "aluguel de bicicleta" por "bicicleta pública"
Change SRCROOT to PODS_ROOT for TestFlight
Added missing fixture file
image swapping functionality added
OAuthTokenService test
TabLayoutPanel style
fixed the gwt warning about SafeUri
added collaborators' impact tab
The shift node now accepts negative shift amounts.
This fixes #249.
[docs] Minor updates to README
[dist] Bump npm to latest version.
[dist] Bump to v0.8.4
highlight package names
Fixed url in ObjectExpirer.iter_objects().

Change-Id: I859a08debc378c2bbb421a6323c6ea6e0564272f
allow / to pass through ratelimit

Change-Id: I891c5ea48511ca9ad47f2adbcbee700d63a4231d
object versioning

Object versioning in swift is implemented by setting a flag on the container
to tell swift to version all objects in the container. The flag is the
``X-Versions-Location`` header on the container, and its value is the
container where the versions are stored.

When data is ``PUT`` into a versioned container (a container with the
versioning flag turned on), the existing data in the file is redirected to a
new object and the data in the ``PUT`` request is saved as the data for the
versioned object. The new object name (for the previous version) is
``<versions_container>/<object_name>/<timestamp>``, where the timestamp is
generated by converting the ``Last-Modified`` header value of the current
version to a unix timestamp.

A ``GET`` to a versioned object will return the current version of the object
without having to do any request redirects or metadata lookups.

Change-Id: I4fcd723145e02bbb2ec1d3ad356713f5dea43b8b
Fix "retries" key in dispersion json output.

Change-Id: I466302f05fd17c5b5460284c372c3667d7c46d7b
Merge "Add support for venv-based test run with tox."
Add instructions for pip install via easy_install.

Add a line item to easy_install pip since we now need to pip install
openstack.nose_plugin. Fixes bug 951019

Change-Id: Ibf4b8bb7feac2b8290db2f4c4665dacf8a881462
Make tests work like they used to.

Change-Id: I081d853a90ad0efce5b7a20b52794ce3348a9617
Added matrix=
Added submatrix, matrix-row and matrix-col.
Added row-reduction operations. Added gauss-eliminate (aka row-reduce).
Added matrix-gauss-jordan-eliminate and matrix-reduced-echelon-form.
Merge pull request #5 from soegaard/master

New matrix operations
Update logMaint.sh
Minor code refactoring
Added Event model
Added Event subscribers method

Timepad::Event.export
Client refactoring
Minor fix
version bump
minor fix
Ignore vim swp-files
Merge branch 'feature/refactoring' of github.com:numbata/timepad into feature/refactoring
Class name fix
Travic-ci
Code refactoring
Added gem rake to Gemfile
Travic-ci status image
Event tests & action
Client && base tests
Merge pull request #1 from numbata/feature/refactoring

Feature/refactoring
Update README.md
Version fix
NXP-10191: disable edit button on toggleable layout for non mutable documents
Sync mobile and deskop tag/comment partials
Allow logging configuration by .amethystrc
Set sortBy and sortByReal tplVars in helper_dataTable
OC: 1168 (ocStore-svn: 552 + 3 upstream commits)
http://goo.gl/6cq4n trouble #1.1 + cutting of trailing whitespaces tpl
http://goo.gl/6cq4n trouble #1.2 (thanks to @freelancer)
Initial UserAgent support
Add some attributes to DataSet entity. Run ./console doctrine:schema:update --force to update the database
Added pytest-cov
Use zepto intead of jquery
Add Thai language translation

translate CMS, CI, CKeditor
Update system/cms/modules/streams_core/language/italian/pyrostreams_lang.php
Fixed Lithuanian translation
Merge pull request #1345 from ChristianGiupponi/patch-1

Update system/cms/modules/streams_core/language/italian/pyrostreams_lang...
Added several methods to the template plugin so that page title, breadcrumbs, and metadata can be set from within page content.
Merge branch '2.1/develop' of github.com:/pyrocms/pyrocms into 2.1/develop
Removed unused pyro.lang.delete as it was causing IE to pitch a fit
Merge pull request #1354 from okhayat/2.1/develop

Updated Arabic translation
Merge pull request #1353 from huglester/17df60cae3624c1fba98a4fc459b804c9bf965c6

Fixed Lithuanian translation
Merge pull request #1339 from nateetorn/2.1/develop

Add Thai language translation
Removed iPad from the mobile array of the user_agent config file. It will now load the full version of a site as our documentation states it will. Closes #1338
Merge branch '2.1/develop' of github.com:/pyrocms/pyrocms into 2.1/develop
Removed a required check for registration data.
Last name for example may not be required, but should still be passed to the database if a user has provided it (this happened in a customers overloaded module registration view). This might not have been right, but it fixed things for the client. @adamfairholm can you look at this?
Added in missing CDN enabling code.
This was added to pyrocms.com but never made its way into the core. Oops!
Add missing space in comment
move docs to 3rd tab
remove menu from right click
tweaking menu
Update readme to reflect current project status.
Updated print example script
Merge pull request #1 from ptone/fixed-print-example

Updated print example script (from Preston Holmes)
Implemented: Getting get params
added checkstyle plugin
working in tests, added test for several matrices types
SimpleTheoroidalMapping; media types for CL
[keymap] fix history button gbquad (was showing movies)
Working on retrieving existing annotations from a CellML file (#73).
Working on retrieving existing annotations from a CellML file (#73).
Working on retrieving existing annotations from a CellML file (#73).
Update to build with new coweb-jsoe
log connection checks
Line breaks for long GP addresses
Fix address case
Fix case on all PAS data
Improve GP address wrapping
try to fix patient addresses with property name and number
Fix stray contacts
Fix patient primary_phone saving
Merge branch 'release/1-moorfields'
Add edit button by default
Update notes for submitted changes

* Extended documentation for using custom loggers
Fix bug where serialization_format is ignored

Change-Id: I5a5ac8b5f18e077105ab12e9b1f0ccafac3983f7
Merge "Fix bug where serialization_format is ignored"
fix unizp-directory-problem when zipped via migration script
Remove Backbone.ViewMaster
Squashed 'scripts/vendor/backbone.viewmaster/' content from commit 0b59614

git-subtree-dir: scripts/vendor/backbone.viewmaster
git-subtree-split: 0b59614081d157df204e65cb579c26229ac5bf5c
Merge commit 'e6975b174b6251fff1da87ede65d014d42f1e7ee' as 'scripts/vendor/backbone.viewmaster'
Make sure that new children do not cause previous to be rendered or detached again
Ignore global leak console
User refreshViews
Display item desc with small delay
Display item background only on fat-clients
Remvoe title attribute from items
Compile css
Add build task for nw packages
Fix clean
remake of the directory with kattis-approved files
Updated gitconfig

Thanks to github.com/orip for inspiration
Remove all sync code
Updated README.md

Updated usage steps to brew unlink/link ruby when installing homebrew/dupes/vim. This fixes a problem when compiling homebrew/dupes/vim.
fixes sorting link style on tables
fixes cols width
listing styles and icons
fixed menu icons, added logout button in toolbar
added icons to admin menu
plugin & themes menus are showed only when b_moderator = 0
add index.php in the redirect when the admin is not logged in
minor fix to execute cron via command line
improvement in upgrade system
Merge branch 'upg' into develop
issue #333 for some mysterious act, it disappeared once done. Redone again. Item's stats are not incremented when the admin or a bot visit the page
New styles: widget-box, select-box. Re-styled dashboard, unintrusive ui js between code: now all ui js functions and triggers are located in ui.js
Merge branch 'develop' of github.com:osclass/OSClass into develop
issue #343 added a coulmn for date and another for the ip, they're show on the user edit panel of the admin
Merge branch 'develop' of github.com:osclass/OSClass into develop
Merge branch 'develop' into testing
Merge branch 'testing' into testing-ninja
issue #349 added a test to check the stats visits of an item from admin/bot
Merge branch 'testing-ninja' into testing
added a @ before free_disk_space because it has an unpredictable behaviour ;( nice PHP, very nice
do not mix static and dynamic group quotas
===GT=== #1906
update 7.8.7 version history item (starter crash with chirp)
===GT=== #3361
Merge branch 'V7_8_7-branch' into V7_8-branch
document default for MOUNT_UNDER_SCRATCH
===GT=== #3393
fixed bad LaTeX formatting, bad grammar, and poor wording in manual
section 3.12.3
Bring 3.12.4 (Installation of condor_compile) into this century, fixing
lots of LaTex formatting and grammar errors.
===GT=== #2433
removing unused file flocking.tex.  The real version of this file is in
the grids chapter.
removed LaTeX comments that would have input the no longer present
duplicate flocking.tex file
fix LaTeX formatting typos and grammar
added spaces to a deltacloud configuration example
Fix frequent redelegation of Condor-C job proxy. #3395

If HTCondor is configured not to limit the lifetime of a delegated proxy
(param DELEGATE_JOB_GSI_CREDENTIALS_LIFETIME or job attribute
DelegateJobGSICredentialsLifetime set to 0), then the gridmanager will
frequently redelegate the proxy of Condor-C jobs to the remote schedd.
The gridmanager's constant redelegation is only limited by
GRIDMANAGER_PROXY_REFRESH_INTERVAL, which defaults to 10 minutes.

Add a check in the gridmanager for the don't-limit-delegation-lifetime
case.
remove condor_glidein manual page
===GT=== #3400
Email notification url was not HT-ified #3397

From the following email discussion on htcondor-devel:
https://lists.cs.wisc.edu/archive/htcondor-devel/2012-December/msg00010.shtml

	Date: Wed, 19 Dec 2012 13:55:07 -0600
	From: Todd Tannenbaum <tannenba@cs.wisc.edu>
	To: "John (TJ) Knoeller" <johnkn@cs.wisc.edu>
	Cc: htcondor-devel@cs.wisc.edu
	Subject: Re: [HTCondor-devel] 7.8.7 string in notification message

	On 12/19/2012 1:44 PM, John (TJ) Knoeller wrote:
	> It seems to me that it should.
	> The code is in email.cpp, Did we miss this? or did we choose not to
	> change it?
	> -tj
	>

	We missed it. I think the below footer should be HT-ified.

	Todd

	> On 12/19/2012 11:33 AM, Nathan Panike wrote:
	>> I installed the 7.8.7 RPM and tested it out in a SL6 VM.  I received an
	>> email notification.  The bottom of the message read:
	>>
	>> "Questions about this message or Condor in general?
	>> Email address of the local Condor administrator:
	>> root@localhost.localdomain
	>> The Official Condor Homepage is http://www.cs.wisc.edu/condor"
	>>
	>> Shouldn't this URL have more HT?
	>>
	>> Nathan Panike
Kill condor_glidein script and associated conifg params. #3400

This script hasn't worked in years.
More HT-ification for email notification #3397

TJ rightly points out that there is more prose here that needs HT.
manual changes to remove references to condor_glidein
===GT=== #3400
Merge branch 'V7_8-branch' of /p/condor/repository/CONDOR_SRC into V7_8-branch
adjust STARTD_NOCLAIM_SHUTDOWN defn to remove reference to
condor_glidein script
===GT=== #3400
remove bluegene doc from repo
LaTeX formatting changes for Windows platform-specific info section
after the word document provided at the Leiden session

 - Created from SoSOL template
 - after the word document provided at the Leiden session

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
corrected according to Berkes and Cowey
Entered by hand (not transcoded text) from ed. pr., with Eng. trans (slightly emended).  I renamed Frags A and B to 1 and 2 as per Leiden+ help.  I corrected 1 typo and 1 reading from the plate in Frag. 1 (perhaps I do not need to mark corrections of typos?  Please advise for the future.).  I am not sure that I entered the uncertain restorations in Frag. 2 correctly, or at least the preview left me in doubt as to whether or not I did.  The macron over the omega in Frag. 2 is not definitely a number (or the ed. is uncertain), and it looks odd: I might have not entered it correctly.

 - Created from SoSOL template
 - Entered by hand (not transcoded text) from ed. pr., with Eng. trans (slightly emended).  I renamed Frags A and B to 1 and 2 as per Leiden+ help.  I corrected 1 typo and 1 reading from the plate in Frag. 1 (perhaps I do not need to mark corrections of typos?  Please advise for the future.).  I am not sure that I entered the uncertain restorations in Frag. 2 correctly, or at least the preview left me in doubt as to whether or not I did.  The macron over the omega in Frag. 2 is not definitely a number (or the ed. is uncertain), and it looks odd: I might have not entered it correctly.

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Rename Text from 'papyri.info/ddbdp/sosol;2011;2526' (DDB_EpiDoc_XML/sosol/sosol.2011/sosol.2011.2526.xml) to 'papyri.info/ddbdp/p.naqlun;2;26' (DDB_EpiDoc_XML/p.naqlun/p.naqlun.2/p.naqlun.2.26.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/p.naqlun;2;26'
Update revisionDesc

 - Vote - AcceptText - Accept. OK to retain frA and frB. lin1-->  .2ν.1[.?]; lin2 del app and simply correct silently. lin2 I agree omega legible in Ἀπολλωνοπολίτου; lin2--> =PN D. M. Ratzan (P.Naqlun 2.26, plate on p.131); lin7--> [.?] [προσ(?)][α]χθῆναι; lin8--> απερθειν; lin8--> δου[κός(?)] [.?]; lin9 no supraline on ω
 (Joshua D. Sosin)
 - Vote - AcceptText - see Sosin's comments and add: 
l2 I agree on the omega.
l6 => [.?] <:[ἀ]ναψηλαφηθῇ|reg|[ἀ]ναψυλαφηθῇ:>
l8 => [.?] [ἀπὸ τ]ῆς; => απερθειν; => δου[<κόσ(?)>] [.?]
 (Lajos Berkes)
 - Finalized - corrected and ready. (Christian-Jürgen Gruber)
Finalization merge of branch 'DDbDP_Editorial_Board/finalizing/2012/10/29/P.Naqlun_2,_26' into canonical master
basic point count reduction solution
DRM_LOCK()/DRM_UNLOCK() accepts struct drm_device now
Missing header
Comment out drm_sleep_locking_init() in bsddrv

 Prototype is in drmP.h, implementation is missing atm.
 While there, add module dependency on new drm core.
Fix BSDmakefile, add defines and includes

 Defines source: Maarten Lankhorst
Kill bo->fakepages
Set memory attributes on page
Add BSDMakefile for tests
Add BSDMakefile for libpscnv
Define INVARIANTS, helps find locking bugs
Add some random locks in pager operations
Lock is locked by drm_close()
Use-after-free error
print more debug info
Merge pull request #5 from polachok/new

Mostly FreeBSD fixes
Connects uid from fob through arduino to node server
Real World Haskell exercises.
Support PAE kernels also
Added Form, Menu, Accordion and Tabs
Homepage Code
some bg works
TIMEUNIT needs to be added for Spell Support
- Also adds Deity Structure for future support (Not Working yet)
Issue#: OS-99


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@18145 b6a209e6-650d-0410-972b-dadffa731f64
minor fixes to gtk3 version
No es posible crear ni eliminar cuentas a través de la interfaz
fix csv endpoint
Removed DS-store
Fixed date bug in fetch_pubmed.py, and a few other fixes.
Fix `main.js` generated output

Indentation and semi-colon missing.
Fix layout so it shows the xfce panel.
Allow dragging with alt-mouse1 in xmonad.
Float the skype window.
Remove smartinput - not ready for primetime.
#47 ignore unresolved variables in ReadVariables

please check if that fixed the issue
make checking for hbase schema faster
make sure to restart memcached on provision
only check for system updates once after reboot
multiply value returned by service to get percentage fixes bug 732067
Merge pull request #472 from ossreleasefeed/multiply-returned-value-fixes-bug732067

multiply value returned by service to get percentage fixes bug 732067
remove left padding from optgroups and increase width fixes bug 612679
Merge pull request #473 from ossreleasefeed/fix-width-multiselect-search-612679

remove left padding from optgroups and increase width fixes bug 612679
Merge pull request #465 from rhelmer/make-vagrant-faster

Make vagrant faster
(no bug) bump schema and dates for dummy data
Merge pull request #478 from rhelmer/master

(no bug) bump dates and schema version for vagrant
(no bug) incomplete schema dump for 3, and backfill correct fake dates
Merge pull request #479 from rhelmer/master

(no bug) incomplete schema dump for 3, and backfill correct fake dates
Added explosive crashes to 5.0.
partially decoupled transaction executor
Merge branch 'master' of github.com:mozilla/socorro into trans2
Added schema for 4.0
Merge pull request #480 from jberkus/master

5.0 explosive crashes data source
early basic start
progress on crontabber
corrected the inner logic of dependency checking
added peer.h
TBB finished and working
Added the ability to turn off "receiving credentials" notifications via Tools -> KeePassHttp Options menu inside KeepPass

+ ConfigOpt: Container class for configuration settings
+ OptionsForm: New UI form to alter the configuration options
* Handlers: Use the new configuration option to determine whether we show a credentials notification or not
* KeePassHttp: Add 'KeePassHttp Options' to the 'Tools' menu in KeePass
* KeePassHttp.plgx: Recompiled
Merge pull request #40 from Plasma/master

Added the ability to turn off "receiving credentials" notifications
more obsessing over init
Added SWF files to correct (assets) directory
[artf532738] - functional test case modifications
Refactory...
Minor editing (seguendo Lollo)
Bootstrappizzazione
Progressi nel bootstrap
Aggiunta info pages
Fine GUI
Avanzo
system requirements check => not finished

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1522 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Pimcore_Mail / Placeholder - added option to disable the layout when the placeholders are replaced from a document

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1523 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Changed assignment of tabbar so it works the same as for documents

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1524 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1511 - Add flag to prevent sendin content type headers

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1525 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Explicity fudge the Host header.
Key names have changed
Test toggling the visiblity of portlets.
Add portlet reordering test.
Crear Proyecto Fox
Vortex Base Code