labofsahil/github-event-dataset-2012 huggingface dataset:
merge conflict
Merge branch 'master' of https://github.com/seekshiva/Festember12
index modified to php
Code refresh and styling
Modify Gemfile to include rails tutorial changes
em.c ok
rm readbuf()
Fixed placeholder text layout bug
Fixed accessory layout for UITableViewCellLayoutManagerValue1
Added sizeThatFitts and improved placeholder text behavior in UITextField.m
And still fixing docs.
do not use frame copy
update test frame generation function
fix problem with multiple windows rendering
remove duplicated code from unix renderer
Latest Visit Session Navigation Complete
remove old charset line from staging.rb
Modify CSS theme file and image locations to work
Merge branch 'feature/3.2' of github.com:sharetribe/sharetribe into feature/3.2

Changes from Juho's machine that were done at the same time (hide feedback in private tribe)
Change like button text to recommend if it is your own listing.
Fixed a layout bug in invitation form.
Merge branch 'master' of https://github.com/sharetribe/sharetribe
Share buttons only if public listing + change facebook share default logo to icon instead of the white grey logo
Fix Facebook open graph urls
update Trustcloud instruction text
Locations are now stored with listings
Merge branch 'master' into api
out with the bern, in with the bez
WaveSMPLChunkReader is created.
The Chunk reader don't support more than 1 loop points.
Merge branch 'master' of https://github.com/shiracha/ShirachaMemo
Modified all pages to have similar look and feel
fix java modular compile error
Refactored apply of latent machines
Revert "fixes a compile error when LAPACK isnt installed"

This reverts commit c464e7a041b57ab39d2581019959f1184a4d1717.
12월 11일 현재까지 곡 정리, 삭제곡 제거
[SHRINKWRAP-417] Archive.move to work for directories
add .rvmrc to gitignore incase dev is using rvm
Maxlength and size should be limit + 1 for text inputs that represent decimal or float columns to allow for decimal point
On passe a python 2.7
Control Bar is much prettier.

Will need to cleanup all the images at some point...
adds a directory tag
go 4!

number 4 - noise! good, ok, ok, ok
API: add api for setting a custom template on a RSS feed.

See initial idea at http://open.silverstripe.org/ticket/6441. Added $template property and corresponding getters / setters for customizing the template used. Added relevant unit test.
Merge pull request #608 from willrossi/trac6441

API: add api for setting a custom template on  RSS feed.
DOC Removed link to missing 'extending-the-cms.md'
Merge pull request #269 from halkyon/fulltextsearchable

Fixed FulltextSearchable non-object error and remove deprecated Object::add_static_var() usage
NEW Allow setting default cache lifetime, and test that it's being used correctly on new caches
Merge pull request #766 from halkyon/cache_lifetime

Allow setting default cache lifetime
test_cases
Add commands dir to gemspec
Update doc/guides/1 - Getting Started/2 - Getting Started.textile
fixed calls to setSelectable
changed selectable access to get/set
fixed calls to setSelectable to use setter
actually support setting selectable to false

moved click handler to method
unregister handler on selectable = false
added types to callbacks
started shape view subclass of fade menu section
started lattice and vector fade menu views
Fix cleanup script for keys that are not found
Merge branch 'master' of github.com:sirikata/sirikata-cdn
Skip _dev in manifest
Fixing HTML.
pgm de test
Rapport
Merge branch 'master' of github.com:siwon/projetBomberman
Rapport
Merge branch 'master' of github.com:siwon/projetBomberman
Rapport
Merge branch 'master' of github.com:siwon/projetBomberman
Merge branch 'master' of github.com:siwon/projetBomberman
Rapport
Merge branch 'master' of github.com:siwon/projetBomberman
Rapport
Merge branch 'master' of github.com:siwon/projetBomberman
Rapport
Merge branch 'master' of github.com:siwon/projetBomberman
Rapport
Merge branch 'master' of github.com:siwon/projetBomberman
Manuel util fini
DocManager - html and css code clean up
Fix - TopicPath snippet
Improved - mm_rules.tpl (ManagerManager)
Improved - Replace new MODX logo image for installer
Delete unnecessary theme images
Improved html and css codes
Fixed typo in comment
Simplifying private method names
Add config option to not auto-append elements to page in order to save reflows.
Update PLAY-PROJ/src/com/satya/play/Play3.java

commit-within remote 1- added int in Play3
Fixed initial migrations
db cleanup and actually useful readme instructions
audio converter added
scripts for .fla files added
Wild West tweaks.
- bah spacing
Adapt case LOOPBACK reveived messages for assisted control commands
initial commit
Add a StaticPages controller
Finish static pages
exercises: created contact static_page and switch db from sqlite3 to postgresql
Fixed bug where vlank lines would be added to a sequence
Make XCC generating .m files with @property for outlets

This is step 1 to have XCC working with Xcode 4.4.
add necessary imports
basic support for removing a reference of a file
add attribute to hold the pbxmodifier script
Update default PBXProj
pbxprojModifier.py now uses the mod_pbxproj
Update Xcode project
make XcodeCapp compatible with Xcode 4.4
Simplify the FSEvent callback.

Events are not so reliable, there are many flaws and special cases (like trashing a folder etc)
In order to simplify the process is the following

- We receive an event
- We tidy up the shadow files
- We check if the given path exists
- If it's a folder, we continue
- If it's a file and it exists : we run handleFileModification
- If it's a file and it doesn't exist: we run handleFileRemoval
By default ignore *.xcodeproj and DS_Store
make XcodeSupport hidden
don't be stupid
Remove useless product group
Add reference to .j too in a group called Sources
Update NativeHost.xcodeproj to build on new Xcode
Merge branch 'refs/heads/upstream'
migrating to a new schema
At so,e point in changes. Move code home.
fix chroot session selection
Update local_manifest.xml

fixed typo system_vold to system_void
Сменил тип подключения Web Fonts от Google на @import
imp nuevos estilos en la vista Home
imp nuevos estilos en la vista Profile
texto y links
added val & bundle loader
round: Simplify apply-point-acceleration with reductions
Fixed XIB Missing Problem
Updated Data Manager "updateAttractions" method
Fix schedule - add links
deprecation of this repository
Fixed Russian translation for Booktype Control Center, updated .mo file
Frontpage dossier element fix for mobile
CS-4421: Wrong link after renaming a topic to a used name
* fixed
WOBS-1133: Newscoop TagesWoche API

artikle rendition replaced by topfront
WOBS-1255 - section pages: show latest 2 dossiers from this section in sidebar

implemented
Hide bisect skip context menu item when repo isn't in the middle of bisect

This issue is caused by 2dcd584a13eb3957f01ade1d5484a7969b899d09
Merge pull request #1074 from vcpp/Hide.Bisect.Skip.Menu.Item

Hide bisect skip context menu item when repo isn't in the middle of bisect
Checkbox to form push added for updating tracking information. Translate form size and position saving
show hash in sendlist
integrated friends feed, linked to bar page for events
Test registering a type two times fails
Merge branch 'master' of github.com:spiral-project/daybed
minor fixes
this is a class decorator.
Add a view to list the fields.
Merge pull request #34 from spiral-project/fields-resource

Add a view to list the fields.
Merge branch 'master' into geo

Conflicts:
	daybed/tests/test_functional.py
	daybed/tests/test_types.py
Change condition to be the same as in SemaTemplateInstantiate.

No functionality change.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@159436 91177308-0d34-0410-b5e6-96231b3b80d8
Documentation cleanup: eliminated Doxygen warnings by deleting a doc comment
on ASTContext::CreateTypeSourceInfo that duplicated information from the
(more complete) version in ASTContext.h.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158504 91177308-0d34-0410-b5e6-96231b3b80d8
Documentation cleanup:
* Escaped @ symbols that shouldn't be interpreted by Doxygen;
* Deleted \param documentation for function parameters that no longer exist;
* Fixed parameter names in \param Doxygen commands;
* Fixed some broken formatting.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158505 91177308-0d34-0410-b5e6-96231b3b80d8
Documentation cleanup: fix \params to match the code.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158506 91177308-0d34-0410-b5e6-96231b3b80d8
Fix a documentation typo: \\brief -> \brief


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158507 91177308-0d34-0410-b5e6-96231b3b80d8
Documentation cleanup: use \p ParameterName when referring to a parameter,
not \arg ParameterName (which should be used only when documenting that
parameter, not when referring to it from elsewhere).


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158509 91177308-0d34-0410-b5e6-96231b3b80d8
Documentation cleanup:
* Converted comments to use \brief to provide summaries;
* Fixed uses of \arg that should be \p;
* Fixed \param [in] [out] to \param [in,out];
* Made minor formatting fixes.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@158510 91177308-0d34-0410-b5e6-96231b3b80d8
Update for r164567.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164568 91177308-0d34-0410-b5e6-96231b3b80d8
Handle C++ functional casts in a similar way to C-style casts in
unused expression warnings.  <rdar://problem/12359208>.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164569 91177308-0d34-0410-b5e6-96231b3b80d8
バリデート周り修正
バリデート周り修正
Corrected flag value and changed parameters of run function in invoke.py
revamp the index and generator script
attempt fix at header parser thread safety issue

scala parsers aren't thread safe (why I assumed they were I do not know), this creates a parser per call instead of the singleton parser.  There is a memory cost here but for now this acceptable.
publocal
Add Quoc P. Ho to CONTRIBUTORS
More material on morphisms of algebraic spaces
Fixed warning about opr_cast(..)
CFG reconstruction can follow calls or not, and follow external calls or not, depending on setting
Fixed bug with Count not being updated on Delete
Shortcuts to auto-fixup/squash

Signed-off-by: Stephen Celis <stephen@stephencelis.com>
pridana sekce pro bankovni spojeni
updated scrollTo
GTNPORTAL-2589: TestSkinService depends on ordering (Missing cleanup after each case)
GTNPORTAL-2571 UIContainer is not thread-safe
GTNPORTAL-2534 All gadgets have label 'Gadget Wrapper Portlet'
GTNPORTAL-2594 - Dependency Cleanup - Part I
GTNPORTAL-2593: Add javax.api as dependency to javax.jcr.api module on as7
GTNPORTAL-2571 Fix junit testcase properly for testing multi-threading
GTNPORTAL-2579 Wrong response JS from JavascriptManager#addOnLoadJavascript
GTNPORTAL-2584 Port missing updates of Reference Guide from EXOGTN to GateIn
GTNPORTAL-2590 Can't get children of UserNode after use UserPortal#resolvePath
GTNPORTAL-2595 - Rework deployment on AS7
Fix failing AS7 extension test
skin cacheable URLs
Support orientation for composite skin
Removing legacy CSS serving completely and rework on junit tests to use controller properly
GTNPORTAL-2597 Skin controller integration
GTNPORTAL-2594 - Dependency Cleanup (Part II)
- removing asm, 5 "commons" libs, guava, jdom, joda-time, hibernate and slf4j from as7 packaging
GTNWSRP-308: Fix an issue where multiple chromattic sessions were sharing the same jcr session when using WSRP.
[Build fix] somehow I missed gatein-dep update to 1.2.0.Alpha05  in parent pom
Refactoring of resource owners and responses to handle unique data properly for all resources

* Added `UserResponseInterface#getRealName()` method, also new default path `realname`
  was added, this path holds real name of user
* Added new path `identifier` that now hold an unique user identifier
* [BC break] Method `UserResponseInterface#getUsername()` now always returns an real
  unique user identifier, an uses path `identifier`
* [BC break] Path `username` was removed
* [BC break] Path `displayname` was renamed to `nickname`
* [BC break] `UserResponseInterface#getDisplayName()` was renamed to `getNickname()`
* [BC break] `OAuth1RequestTokenStorageInterface#save()` second param `$token` now
  must be an array
Refactoring of resource owners and responses to handle unique data properly for all resources

* Added `UserResponseInterface#getUuid()` method, also new default path `uuid` was added,
  this field holds unique identifier of user
* [BC break] Path `username` (and `UserResponseInterface#getUsername()`) no longer holds
  or returns, an unique user identifier
* [BC break] Method `UserResponseInterface#getDisplayName()` was renamed to `getRealName()`,
  default paths for most of resource owners were also renamed from `displayname` to `realname`
* [BC break] `OAuth1RequestTokenStorageInterface#save()` second param `$token` now
  must be an array
Fix configure error when no libiconv is found

Somehow this dindn't happen prevously
-- did something change in CMake 2.8.10.2?
Use little-endian byte order when decoding UTF-16

We need to pass "UTF-16LE" and not just "UTF-16" to iconv when
converting UTF-16 strings contained in unicode-aware Inno Setup files
as the latter is platform-dependent when there is no BOM.

While it worked fine under Linux, on OS X iconv aussmed UTF-16BE and
text would get garbled.

Fixes: bug #3
Add a note about CMake's check_cxx_compiler_flag
Use libc's bswap_{16,32,64} if missing builtins

We still have our own unoptimized implementation if nothing else is
available.
Prefix configuration defines with INNOEXTRACT_

This is to prevent clashes with libraries whose authors should be
lynched.

Also use #cmakedefine01 instead of #cmakedefine as to prevent bugs
caused by mispelled configuration checks.
Change the CMake project name to innoextract

Was "InnoExtract"
Set the default symbol visibility to hidden
Improve checks for compiler and linker flags

- Check more warning expressions against the standard output

- Don't pass linker flags to be tested to the compiler
merge with upstream
Merge branch 'master' of github.com:stopmotionimac/tweedy

Conflicts:
	src/tweedy/gui/timelineGraphic/qml/TW_Clip.qml
	src/tweedy/gui/timelineGraphic/qml/TW_Timeline.qml
Add recent git commit history to sidebar
use onenable() to check plugin's 'nobody'-permissions
working override game set for networked game
no car collision fix wheel rays
torque curve multiplier
mod rmdir pos
Create the wait event

This change creates the wait event and adds a regression test for it.

Testing done:

Wait's regression test.
exercise for HFjava
feature to view all the goals
getting favicon to load
Added Role.cs
Added Databases.config
Added connectionstring to DataContext constructor
Removed MembershipRepositoryTests
breaking up into BingTranslator and WebRequest
don't need this concept
Add hiera wrapper command
Remove extra newline
Improved search criteria for MP3
Fix typo in css keyword
Completion: use GResource for the XML UI description

There were two translatable strings in the UI description that were not
extracted into the PO files.

GTK+ 3.4 is required, as well as GIO 2.32.

https://bugzilla.gnome.org/show_bug.cgi?id=674643
Completion: fix mnemonic of the "Details" button

Due to bug #674759 [1], the mnemonic for the "Details" button didn't
work when the "gtk-auto-mnemonics" setting is true.

But anyway we don't need markup for this label, so it's better to remove
it.

[1] https://bugzilla.gnome.org/show_bug.cgi?id=674759
Completion: migrate the UI description to GtkGrid

The scrollbar policy is by default "automatic" in GTK+ 3.

The first children of the GtkGrid's don't have packing properties
because all the default values are OK for them.
Panels Layout Fixes (Part 2)
adds foreign language translation options
strange strange git conflicts.
Made static_pages rspec tests nicer and more compact
moved text files into lib
using sieve method to generate primes
commit changes.
commit changes.
commit changes.
commit changes.
commit changes.
commit changes.
add ark auth config in debug invironment.
1.1版本
添加了THDispatchQueue，GCD实现的一个多线程并发控制的队列。
添加了THWebDataCache，非常简单的缓存组件。
testing SSH stuff2
Short: Moved the where the game window runs.

More to left and higher
Change dependencies
Forgot hem build
Working on UI, date picker, routes and more
Arduino mode
change escaping '\r' and '\t'
refactor parse method
ump to v0.1.5
Remove last vestiges of exit-code-as-return-value. Fixes #510.
Make help task look up argument in aliases map.
news/todos
Utilizo el texto escrito en el input text para buscar las noticias por titutlo.
Added error code for NSURLConnection async calls.
small changes
Merge branch 'master' of github.com:tequnix/TequnixConfig
added i3
Not sure if it wasn't working before, but hash element list works.
addind client
Rename functions, remove un-needed code. (WIP)
Fixed city listing in Hotel.jsp and other things
Merge branch 'master' of github.com:thegamemaniac/vet-tec

Conflicts:
	build/web/index.jsp
Touch the person record on login

This is to force clear any cache tied to the person when they log in.
Most importantly it flushes the org nav and permissions caches
Fixed the count display of every groups
MH-356 done
Merge branch 'MH-356'
Merge branch 'api' into dev
Merge branch 'api' into dev
Use 422 response code instead of 400 response code on API

After looking at ActiveResource, 422 is more consistent for invalid
create/update calls than using 400
fix hash syntax in test
Merge branch 'master' of github.com:thelabtech/missionhub
cascade delete organizational_roles when deleting a role
Merge branch 'master' of github.com:thelabtech/missionhub
Merge branch 'MH-507'
use russian doll caching and get it out of the db
Merge branch 'dev' of github.com:thelabtech/missionhub into dev
Merge branch 'cache' into dev

Conflicts:
	app/views/shared/_nav.html.erb
Add extra_tags list to tag format variables

Signed-off-by: Jack Miller <jack@codezen.org>
commentaire : abandon des repères "="
stop printing to System.out, use JDK logging instead
Add value callbacks for tokens and constants.
Only show tokens when needed.
Added Fields endpoint.
Remove excessive mem usage
Clean out remains of the old EEPROM driver.
Move the last of the board-specific code for PX4FMU out of the NuttX tree.  Now it's just configuration.
Changed to UART5 for console
Extended GPS struct with velocity vector
Fix compile warnings
prevent double-precision promotion where its not required
New param interface for microSD and EEPROM
Merge branch 'master' of github.com:PX4/Firmware
Reverted to IO compatible config
Casting and fix default param path
Remove the arbitrary limit on the path to the default parameter file.  Add a verb to the param command to set the default parameter file.
Merge branch 'master' of https://github.com/PX4/Firmware into fw_control
index: fix link to transmit
Updated README to mention the CLI and tournament.sh script.
Remove leading spaces before js driver

* causes incosistent formatting
Add a more detailed generated README
added rules for assigning values in the grammar
Fixed some assembly typos
Fixed parameter passing for statements
Added methods to get variables and constants of a function
Function assignment now works
Merge branch 'master' into assignment
Fixed test quote output issue
Fixed parameter to register assignment
Fixed loop labels
Fixed ASM labels for constants
Fixed output of test.py
Minor change on the PGCD's example.
Syntax correction
first commit
Merge branch 'master' of https://github.com/timav/ExampleMessages

Leaning process
remove duplicated README
Added more explanation to README.md
Creating a Github Blog Using Octopress
some bytes saved
use reduction in size with each()... never expected that...
use each for objects...
debug

Signed-off-by: Tim Shadel <github@timshadel.com>
Import works with minimal memory usage
Change template instructions to current versions
fixed error for bogus urls
Make it fit on iOS screen?
missing header
A lot of new stuff, e.g. implementation of hVectors
Fix SCTP multihoming

Setting several ip addresses for an SCTP socket worked only for IPv4
on Linux.  For IPv6 and for other for instance Solaris and FreeBSD, it
failed with badarg for both IPv4 and IPv6.

For the first address specified to gen_sctp:open, bind is now called,
while for any following addresses, sctp_bindx is called, repeatedly,
with one address at a time.  Previously, sctp_bindx was called for all
addresses in one go, with the addresses in reverse order, and bind was
not called at all if more than one address was specified.  Both
Solaris and FreeBSD requires bind to have been called before calling
sctp_bindx, and FreeBSD additionally allows at most one address at a
time in the call to sctp_bindx.
Allow mixed IPv4 and IPv6 addresses to sctp_bindx

Also allow mixed address families to bind, since the first address on
a multihomed sctp socket must be bound with bind, while the rest are
to be bound using sctp_bindx.

At least Linux supports adding address of mixing families.
SDO
fix crash in phar detection with short file names
fix minor memleak
Removed getQueryVariable() as it's no longer needed.
split out debugging endpoints into a separate package, webpagemaker.debugging.
added a proxy to the mission slurper, so that CORS issues don't prevent fonts and such from loading.
Updated Term to expose its values
Implemented a workaround for a limitation in the current 8tracks-Sharp library that caused a buffer overflow when querying an EightTracksSession.
Merge pull request #8 from kristian-pettersen/master

A fix for a bug/limitation in the 8tracks-Sharp library.
Update _locales/ja/messages.json
Gio/Thiago: running 'gradle test' as part of run script.
Add webhooks for the start of builds (off by default), with a repository payload
Rename notification methods to specify whether they are triggered on start or on finish
Send the build (rather than the repository) as payload for on-start webhook notifications
Allow on-start webhook notifications to be configured using the always/never naming convention
Merge pull request #34 from laserlemon/master

Add webhook notifications for started builds
howtogrammar
Dev enhanced support for "self" and "that" so that can use multiple row/column sub-selectors
Dev added sample survey showing how to use "self" and "that" variables
Fixed issue #06283: Quick translation is not working
Dev Corrected minimum "additionalLanguages" condition
Fixed issue #06296: Question type file upload dose not work
Dev Corrected invalid JavaScript
Fixed issue #06298: File upload button too narrow in Safari + Chrome
Dev Corrected file upload button width
Dev: some accessibilty issue for ranking (add label)
Dev: HTML ability in ranking
Dev : fixed ranking for IE8
Dev: start reviewing template
Updated translation: Czech by slansky
Fixed issue #06300 : Token can be duplicated under some condition (For Yii : dummy token)
Dev: Fill the token table with existing token for dummytokens
Dev : Fixed #6301,#6300 AND old #3058
Dev : remove in_array test, put true for $existingtokens[$newtoken]
Dev tested with 1 000 000 token too
New feature : Allow different repeat heading for array, array text and array number question type
Fixed issue : bad repeat head with some parameter
Dev : start reorder of question attribute
Fixed issue #6252: English warning message though German language set
Dev Automatic translation update
Fixed issue #6268: Seemingly unable to save when editing a token
Merge remote-tracking branch 'origin/Yii' into Yii
Fixed issue #6279: "Cannot modify header information" warning after DB update
Fixed Issue #06286: White screen when you enter in /index.php/admin/index after login with a user whitout permission
Fixed issue #6284: In some cases statistics' layout is broken
Fixed issue #6285: Error on response export to PDF
Merge pull request #11 from jositopr/Yii

Fixed issue #6286: White screen when you enter in /index.php/admin/index after login with a user whitout permission
Fixed issue #6293: {SURVEYURL} incorrect in invitations/reminders
Fixed issue #6295: Cannot change question group
intentionally broke a test to see what jenkins does
2. tehtävä
testailtu controllerijuttujen toimintaa
招募时间JS校验修改
Refactor json dumping to a separate function
Finish login to course navi.
Added back server comment and added keywords
Somehow grunt-jsmin-sourcemap escaped from package.json
Sourcemapping working nice =)
Updated grunt-jsmin-sourcemap to latest
DOCS-792: additional clarifications to replica-set reconfiguration text
Added AutoJoin

UNTESTED!!
Completed for Release 1

A few improvements like immediate results and explanations.
RELEASE 1

Packed for release 1. This app is available now in the Chrome WebStore.
Bug Fix for release 1

This is the same as release 1 but can be considered release 1.1
added hotkeys, menu
provide version in the english filter
Translog: Buffering translog does not write directly to the file channel but to RAF, which causes problems reading from the channel on windows, closes #1887.
adding fixIndex() method
adding 'fix' value for invoking Lucene's fixIndex method
index.shard.check_on_startup set to fix: throw failure only if we are not fixing the index
allow to set the full source when creating index (settings + mappings) in the Java API
allow internally to register index warmup actions, as well as expose stats on it
JDK 7 requires minimum of 160k stack size, update scripts to set it, closes #1892.
allow to specify which executor to use when warming up
JDK 7 requires minimum of 256k stack size, update scripts to set it, closes #1892.
Highlighting: Using "plain" (non term vector) highlighting with custom score within a filtered query fails to highlight, closes #1894.
make the call the apply settings sync'ed
When a node disconnects from the cluster (not enough master nodes, or a client node) and rejoins it might not update its internal routing table, closes #
add 0.19.4
remove unused class
allow internally to register custom metadata with an index and global metadata
add trace logging for how long it took to load field data cache
use nanoTime instead of millis
automatically fix maxMergeAtOnce if segmentsPerTier is changed with tiered merge policy
add logging with a reason why the cache is cleared (filter and field)
Implement #first.
Install basic components.
removed commented pseudotest from test example
Implemented Basic Scanning Profiles
Implement basic scanning profiles
Bundle getresults Fix.
Merge branch 'feature_register' into production
Merge branch 'development' of github.com:unwired/unwiredsplash into production
code block ending try
Check ACL file on SSL Level
Merge branch 'master' of https://github.com/ushahidi/Ushahidi_Web into esri
Removing the "FeaturesCollection" ison property as it's already set in the JSON controller

* Fixes issue of OpenLayers throwing an error because it's unable to
find the geometry property of a marker - http://i.imgur.com/pK0qb.png
Reports page break

Signed-off-by: Linda Kamau <kamaulynder@gmail.com>
Tags cleanup
Plays *royalty-free* mp3 now
added directional stuff as well as background changing and background music. removed menu code that didn't work
Subtracting nps for unsubscribes
Book chapter1 upodated
huxideng succeed
add default rake task to run test
provide insert class
fix admin_experts
Test and Fixed fizzbuzz function
test eikona
Many small incompatible changes to be compatible with Chef.
Add requirements to setup.py.
Bump version
fixed: windows install components
added: windows groups for vs
fixed: HDRStage wrongly classified as bundle
Refactor the panel controller configuration code to support configuring panels from xtype and config objects.
Create script so that buildbot can rebuild without depending on autotools artifacts
rebuild template with new engine
Merge branch 'hotfix/rebuild-example'
Merge branch 'hotfix/rebuild-example' into develop
deprecated functionality has implemented
incremented package version
Merge branch 'release/0.0.8'
can successfully update candidates
fixed option -z: some builds not archived were hidden, and could not be rolled back to; option -z: require specific input for build #;  adjust some timing; minor text tweaks.
Added information for making xterm work correctly with RVM
Merge branch 'master' of https://github.com/wayneeseguin/rvm-site
Update for 1.3-alpha-2: Get SSP working
Fix internazionalitation in documentation
kalua: merged generate_kalua_load
Gearing up to integrate datomic
Added web unit and e2e tests for translations table
error change
error change again
More changes - now correct
put "Retreiving..." text in proper func and switch function order
Prevents the adding of 'align-undefined' when no alignment is set to a
captioned image.
Updated project version
Bugfix for pull request 691 by @evo42.
Merge pull request #695 from wimleers/dev-captioned-image-center-getalignmentbutton

Bugfix for pull request 691 by @evo42.
Corrects height calculation of panels #620

If correctHeight() was called when the sidbar was closed,
or during the opening animation, the panel height would
be set to zero, and due to the early return it would stay
zero unless the window was resized or new panels were added.
Adds clarification about block root elements
Turns error message into a warning
Added EmptyBlock implementation and documentation
Added translations for tab labels for toolbar
Merge branch 'hotfix-0.21.x' of git://github.com/taylor-gentics/Aloha-Editor into hotfix-0.21.x

Conflicts:
	build/hotfix-0.21.x-changelog.md
Fixed JS error in Aloha.unbind()
Added mahaloBlock() and .unblock() methods.
Fixed adding of unwanted <span>s before tables when the table plugin and block plugin were used.
Merge branch 'hotfix-0.21.x' of github.com:alohaeditor/Aloha-Editor into hotfix-0.21.x

Conflicts:
	build/hotfix-0.21.x-changelog.md
Updated repository browser. This introduces a ui enhancement. The repository browser height will now be increased.
We do not abort the onselectstart event for blocks (in IE), since this prevents selecting of text in nested editables (using either keyboard or mouse).
Merge branch 'hotfix-0.21.x' of github.com:alohaeditor/Aloha-Editor into hotfix-0.21.x

Conflicts:
	build/hotfix-0.21.x-changelog.md
Added commercial start fragment
Merge branch 'hotfix-0.21.x' of github.com:alohaeditor/Aloha-Editor into hotfix-0.21.x
Fixes typo in documentation
Merge branch 'hotfix-0.21.x' of ssh://github.com/alohaeditor/Aloha-Editor into hotfix-0.21.x
Wait for a while before looking for LSM major merges, in case merges catch up with inserts.
Don't stop evicting until we reach the target, have eviction wake up periodically regardless of whether the application signals it.  This latter requires a "timed condition wait" operation.
Tweaks to file configuration for reads on Linux (disable readahead and access time updates).
Calling get_key after a failed search is now permitted.
Adicionando estilos e texto explicativo.
added visual nudge, fixed timing on beat handling (which helps jumpsync). Revamped beat LEDs: now goes up to quarter notes, much more robust. Timers added for jumploops, also added loop scheduling. Other fixes and edits too.
readme converging to 1.0
upated text on fleamarket/wanted page
Readme update for translation, special note for ticket 1000
Merge pull request #790 from GeertDD/display_no_tax_row

Force the tax row to show up even if no taxes are applicable
Merge pull request #1 from woothemes/master

sync
Fixing SQL syntax in woo.._product_ordering().

Your sql syntax not good, please check my fix.

Thanks you. ;]
Yakir.
Merge pull request #1908 from KingYes/master

Fixing SQL syntax in woo.._product_ordering().
Restore typo3-merged.js
Updated javadoc for version 1.04
And here I fix my UI. Might as well do quality. =)
FInally got MathJax to render when Aloha loads
No functionality changes
Merge branch 'gh-pages' of github.com:wysiwhat/Aloha-Editor into gh-pages
No changes
Merge branch 'gh-pages' of github.com:wysiwhat/Aloha-Editor into gh-pages
Syncing changes
Commiting any changes I missed
Merge branch 'gh-pages' of github.com:wysiwhat/Aloha-Editor into gh-pages

Conflicts:
	src/plugins/extra/math/lib/math-plugin.js
Reduce a little code duplication
Language cleanup
Merge pull request #2 from perbu/master

Thanks, merged.

I study English.
Removed some files from index that are not needed for creating the bitstream.
Corrected typo chose->choose on page 29.
Added --dev flag.
download a CSV file
adding a couple methods for converting existing adjacent list
variable name configuration for current_user context processor
Allow passing data arguments to modal
Merge pull request #21 from gavrilyak/master

Allow passing data arguments to modal
vala: update to 0.18.0.
xen: needs which to build.
cantarell-fonts: update to 0.0.9.
fix visible page count problem
Fix inflector matching

Prevent cached Rexex from starting the search at the previous location
in the string
環境の変更
using truck ctags, so we get ObjectiveC support
image upload

Signed-off-by: Ying-Chau Huang <yingchauhuang@gmail.com>
Also try to parse HTTP files
Arch: Walls and Structs can now be created directly from meshes
Add new Mod/Mesh files to Makefile.am
Replace Gui text View->Display mode with View->Document window
Merge pull request #4 from msocorcim/msocorcim/general

Msocorcim/general
Improve I/O of PLY mesh format
0000652: Polish language not available even if translation is available in source
Implement manual alignment utility
Fixed #0000654 - Startpage translation
Fix Makefile.am
Fix crash in TopoShapeface.getWire()
Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad
Added 0000650 - Placement.isNull() function
Fixed 000655 - Draft dimension default size
Merge branch 'gh-pages'
Revert "Merge branch 'gh-pages'"

This reverts commit ac27fbb17c730c4b0d62d8e93e43caace13a3eda, reversing
changes made to 851c4ea028154734bb3840ab2c28d53642649ca2.
Added default image for the new 4" display
moved factory gem to prod
removed responses from valid poll seed
added tropo provisioning gem
added a bunch of stuff to poll controller spec
session storage, when turning back from show to universe
v0.1

Init
fix the bug with get-selection-range.
mate common
Fix common actions
utils: invarg: msg precedes the faulty arg

fix all call which reversed the arg order.

Signed-off-by: Dan Kenigsberg <danken@redhat.com>
Fix formatting of ip.8 family man page

fix bad formatting in description of -f option
iproute2: fix typo in help message.

Signed-off-by: Li Wei <lw@cn.fujitsu.com>
iproute2: configure: Add search path for 64bit library.

Use pkg-config to tell us the library path and fallback to search
old paths if xtables.pc not exists.

Signed-off-by: Li Wei <lw@cn.fujitsu.com>
Explain TC class id limits
moving disclaimer.txt into viewshare package for site specific customization
hard coding values in disclaimer.txt
creating first locale
reconfigure Rakefile from duplication
initial spec
- Improved search base path.
- Merged.
use neocomplcache#popup_post() instead of neocomplcache#fix_down()
- Improved documentation.
- Fixed :NeoComplCacheAutoCompletionLength documentation.
Merge pull request #260 from zhaocai/develop

Fix: key mapping issue #252
Merge branch 'master' of https://github.com/Shougo/neocomplcache into develop
get loc through sms

add the function that if you receive the message including "?:?" then
send the location infomation
Make compatible with pytest < 2.3
push heroku
heroku
save
save
don't ignore the session file, because actually that's useful
new readme, update license
handler interface class added
new handlers: general events handler and nodes events handler
added events constructors
added bool type of modules params
modules has more information about dependencies
create the log file in the same directory that project file
wrong lua locale fixed
find the information about recordable events in project file
big commit:
1) lua correctly send module params with bool type
2) lua don't send empty interfaces
3) lua works with new handler interface
4) event handlers gets event params from dependencies
Merge branch 'master' of github.com:zpp0/wsnsim-simulator

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
removing old font files
adding new font files
adding new IE stylesheets
renamed some stuff
decided to add SCSS files as well
add config to plugin
A config to run megaL related modules
v1.51: don't encode system_media DB
WHISTLE-42: presence tweaks
WHISTLE-594: use emergency caller id if the outbound is not present
updated download/index.html
removed .gitignore, added image
removed .gitignore
Made the hetherto unwritten Metacity function reaccept the same argument.
Set up a parse for the command-line color.
Command-line color argument now checked. Closes #3
some files are removed
Created client classes for introductions and importations
Finished the HOFs chapter :)
Update notes for submitted changes

* fix AOKP remote
Corrected bugs in matching sms keyword
added code to ease the manipulation of arg-lists keywords
finished node class
ADD A note for a TODO in Install Script
ADD From now on, custom functions are stored in separated files in `functions` folder.

As Asked by @Zaiste! on PR #32 (https://github.com/zaiste/vimified/pull/32)
ADD Complete the list of files extensions to ignore
IMP The comment was inconsistent according to the command
IMP DRY code in Install script
Revert "Policy: Add lockscreen timeout overrides (Part 2/2)"

This reverts commit 7249a072ac2f9501934ad8c9f3d27a7847b9ec9f.

  Reason : This is now part of AOSP as of 4.1.2_r1
...

Change-Id: I79bd2a6e9ed3c5e3f99f749bc3d824a1fda8d942
Merge remote-tracking branch 'aokp/jb' into jb
Framework: Custom targets WIP!

Based on CM10.
Added options for 3-8 targets and our old octo layout for 6 and 8.
Added AOKP icons pack. Icons by Kwes1020

functional but not ready for merge quite yet.

patch set 2: rebase
patch set 3: fix camera when reseting targets and clean out some
fields we aren't using anymore.
patch set 4: Octo layout inline with Sethyx
patch set 5: Fixes some theming fcs issues
Patch set 6/7: rebase and add octo layouts for tabs

patchset 10: fix the icon sizes when using the apps png
Patch set 11: Add method to round edges of custom icons

Change-Id: I1a0290eeaf7236a7be7da831176f718134f971e4
Revert "Optimus 4X LockScreen Mod"

This reverts commit 2d4dc5712caeb0f0065d6f73c47bf9abd10d3c70.
Merge remote-tracking branch 'aokp/jb' into jb

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I11315cd5d161e76a9ab89fe197ff84dd3b970be9
don't forget the math libraries
change properties from window
Add unit button and add unit action has been refactored
Bug with storing atlases in AdvImageManager.java has been fixed. loadResources method has been added to LevelScreen
Améliorations en folie
Octopress init
Site updated at 2012-08-07 14:20:56 UTC
Site updated at 2012-08-07 15:58:23 UTC
Site updated at 2012-08-07 15:59:39 UTC
Site updated at 2012-08-08 15:44:58 UTC
Site updated at 2012-08-08 18:39:24 UTC
Site updated at 2012-08-09 13:34:45 UTC
Site updated at 2012-08-09 13:43:08 UTC
Site updated at 2012-08-09 13:46:59 UTC
Site updated at 2012-08-09 16:52:12 UTC
Site updated at 2012-08-14 14:00:06 UTC
Start of migration stored procedure.

Currently adds the specified key and value to the tuple.
Add migration file that is used by migrate.js
Validate updated values during migrations
Make updateFunction optional and check its return alue
Save migration to migrations collection
Merge branch 'migrations'
ST-002 : Add bounds
Got rid of the .nuget stuff. It was added by nuget but is unneccessary
add description, add .inputrc
Commit depuis Ubuntu
Update methods/widget/Bank.java

I did it wrong last time.. -_-
But basically, this should be in there.
Update methods/node/Menu.java

Made clickIndex(int) public for previously discussed reasons.
Merge pull request #468 from b0xb0x/patch-3

Public clickIndex(int)
Merge pull request #464 from SirCookie/patch-2

Update methods/widget/Bank.java
clean
Added new settings.
indexOf methods for Inventory.
Equipment API
Attack/Combat API
clean up javadoc
fix setting
Update methods/tab/Equipment.java

Slot index's updated
Replace all uses of (i * 3 + 8) since pattern does not follow for aura
equip changed to use getActions() - using interact causes mouse to move several times for "Wield"
Merge pull request #471 from Logicail/patch-1

Update methods/tab/Equipment.java
Added Bank#getItems(Filter<Item>)

Also modified Bank#getItems(boolean, Filter<Item>)
Y the brackets?
Do not instantiate twice.
Merge pull request #482 from Azerbaijan/patch-21

Do not instantiate twice.
add screen buffer helper
append plane in Tile#toString
Slightly modify some area calculations
Post scaffold added with sqlite3
added archiva repos
Update libraries/legacy/updater/adapters/extension.php

Updated with the suggestions made by Sam.
Update src/org/Barteks2x/b173gen/generator/beta173/MapGenCaves.java
Fixes to IPackageExtensions, adding unit tests to support it.  Adding mock objects from NuGet codebase.
Selection is now only possible on a square with a pawn
vim :: 7.3.596-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
opera-adblock-main :: 20121221-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
opera-adblock-stat :: 20121221-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
opera-adblock-elements :: 20121221-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
Added png version of current cur files
Monday morning
Monday morning 2
added preexisting class
user_activities to database
user_activities to database
Merge branch 'master' into dev2
Merge branch 'master' into database_user_activity2

Conflicts:
	app/controllers/simple_forum/application_controller.rb
	app/views/simple_forum/forums/index.html.erb
	app/views/simple_forum/forums/show.html.erb
	spec/dummy/db/schema.rb
fix
removed 'self.table_name = '
Merge branch 'master' into database_user_activity2

Conflicts:
	app/views/simple_forum/forums/show.html.erb
citation fix
Merge branch 'database_user_activity2'
bump version
pequeños cambios para poder separar el collection de la view en los followers
Title index
canonical-filepath-1.0.0.2
8.11.2012
fix django admin tools
Added 9axis back in
more tutorial
make timer system more compact
start explaining resource view
fire event on showing resource view
Merge branch 'master' of https://github.com/CapsaicinGames/ld48-23
Update Oblivion.tmTheme

Some changes to colors
updated recipes/ for Filtering Data
use <CR> instead of <Return>
NO WARNING MOFO :D
Implement tree-based-constant-folding pass

Close #27
Added checks to see if file exists for YamlManager, throw error if it doesn't exist.
Made LoggingManager not static in DataManager, need to find another way to use LoggingManager in DataField
Adição do Build Status no README.md
Fix duplicate Forms when saving a Pending form to Drafts
Fix YUY2 bug introduced in Commit:802c0fde4a578fe7d01597ddc5b2ca1d282f193c.
Bugfix: scroll up/down crash.
Bugfix: fix crash when a \clip runs out of video frame.
Refactor for bitmap cache.
Minor changes.
Move dirty rects merging code.
Separated dirty rectangles. [Part 1]
Separated dirty rectangles. [Part 2]
Separated dirty rectangles. [Part 3]
Stored hash value in with objects.[Part 1]
Stored hash value in with objects.[Part 2]
Stored hash value in with objects.[Part 3]
Stored hash value in with objects.[Part 4]
Stored hash value in with objects.[Part 5]
Stored hash value in with objects.[Part 6]
Stored hash value in with objects.[Part 7]
Stored hash value in with objects.[Part 8]
Stored hash value in with objects.[Part 9]
Paint Machine. [Part 1]
Paint Machine. [Part 2]
Portfolio Updates

Updated project writeups
Add redis library
Add 10-d-dimensional game vectors to redis store
Removed pyramid default front-page.
Removed .class files.  These will be packaged into a jar for ease of
download.
Moved positioning from model construction to vertex shader

Working implementation of a custom Effect now.

Uses a matrix as a 'model->world' transform. This includes the
positioning element of the process, which was previously performed by
recreating the vertices of each object each update. This world transform
is on a per IGameObject basis.

Uses a view matrix, a camera, which just sits above the origin and looks
down.

Then it uses a projection matrix, which maps the 3d world onto the XNA
viewport.
Tried to fix the arrows to use the shaders too, but it didn't work.

The arrows need to be drawn with their own Effect as they need to
rotate!

Sub parts?

Model etc.?
Small refactor of drawing arrows
minor change to the number of retries the console does when trying to
contact jython
Fix NPE in closing old plotting windows
Move interpretation of pointer movement from profile classes to ROI handlers
Pixel Info: workaround to use vecmath package
pixel info: added note on Vector3dutil
SCISOFT-UI: feedback view - improvement of the message dialog when
feedback not sent
Plotting: Added exception handling to the AnalysisRCPActivator for
dealing with rpc and rmi ports. The problem was intermittently
preventing any plot view working ~50% of the time.
Merge branch '1.2' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-ui.git into 1.2
Everthing isn't broken anymore
Figures added
Merge remote-tracking branch 'origin/master'
Update sygxysis.py
Adds homework assigned in seminar 03.

Telnet interface is now working and operational and should work on both
Linux and Windows.
search y delete con Data.Set
Site updated at 2012-12-26 17:44:48 UTC
log is a hell of a function
Merge branch 'master' of github.com:EaTea/OS-glowing-ninja

Conflicts:
	globals.c~
	globals.o
	scheduler
	scheduler.c~
	scheduler.h~
	scheduler.o
Added subtree merged in contrib\library\text\parser\json
Merge branch 'master' of https://github.com/eiffelhub/json

Conflicts:
	draft/library/kernel/json_object.e
Merge branch 'master' of github.com:EiffelWebFramework/EWF
Merge branch 'master' of github.com:EiffelWebFramework/EWF
Merge branch 'master' of github.com:EiffelWebFramework/EWF
add GigaBit tips for LibVirt
Revert "build: fix device assertions"

This reverts commit 5e804b78461ec5e1d1b2a224289ea8cf50c84bff

Apparently this breaks on devices that do not manually define their device name, going to look into this.

Change-Id: Ia5d7d2a3a232ef8131293d5e70bfe8be40644e34
Initial creation of the s-ramp-ui project structure.
Added a newline to lib.js
Print md5sum for otapackage zips.
Correct TTAN high temperature transition
TPT: Don't hide stickman when energy particles pass through his head 9f0c4857e
TPT: Make TTAN block pressure when framestepping 58ea2b2acf
Revert "FINALLY fixed NPEs when a ServerQuery Client logs on. Moved all the checks out to the TeamspeakListener, so the EnterEvent won't be called if the client is a ServerQuery. Also fixed some bugs in the ClientList."

This reverts commit 7e0c6eb34dc5045e09d503208c5b468b072fba1a.
Aaaand fixed it again, this time without screwing everything up, I hope.
Update items to 1.2.4 .

Signed-off-by: FlukyPhoenix <git@flukyphoenix.com>
bugfix
bugfix2
Merge FrOSt_All_in_one.hex
Missed a few URL spelling mistakes
Documented setBgPlainColorFromHex
Removed WinForms, XML Config, Dynamic Plugins

* Removed all traces of WinForms, so now application only runs as
console app though Afterglow.Web
* Removed Nini configuration
* Added XML configuration
* Removed Settings Class and Replaced it with AfterglowSetup, inline
with XML saving
* Removed some custom attributes and replaced with Data Annotations
attributes
* Plugins now auto load from Afterglow.Web/Plugins directory
Initial working version of JS-driven DOM background changing every second by XORing with values of Hour, Minute and Second
Merge branch 'master' of https://github.com/GSMcNamara/ColorOfTime
Add define and call function, and return

add key words:
def, return
add
statement_call, statement_function
EP Release date added
alteração no Diagrama de Classe.uml
alteraççoes feitas por Maurílio
alteraçao no Diagrama de Classe.uml
[#37076621]  Make column comments searchable; present and display comments for columns and tables on dataset viewer.
Fix staging build
[#30938105] fixes for restore
[#30938105] disable failing backup restore specs
Delete old Class Component
Rebranded from MG to NStack.
More tidying of textured quad sample
Fix for fd_load_fat
Wording changed, Tim Koschella
Start-Up Logos 2nd try
adding back MVLE to recursion introduction...  got deleted in last
commit somehow
You can now scale font size, 32 pts each.
Create r2d290.h