labofsahil/github-event-dataset-2012 huggingface dataset:
cmake: add client/server channel options
cmake: added Android toolchain
ctest: delete generated files
Merge branch 'channels' of github.com:FreeRDP/FreeRDP into channels
cmake: add build system integration of mobile clients
channels: disable certain channels by default on Android
libfreerdp-codec: add support for android cpu-features module
cmake: fix STATIC_CHANNELS=off build
cmake: make sure build works with cmake < 2.8.3

cmake/compat_2.8.3 contains files required for cmake versions < 2.8.3
and CheckCmakeCompat includes them if necessary.

CMakeParseArguments.cmake and FindPackageHandleStandardArgs.cmake are
taken from the modules shipped with cmake.
Merge pull request #781 from bmiklautz/cmake-compat

cmake: make sure build works with cmake < 2.8.3
libwinpr-library: fix unit tests
cunit: deprecate cunit

cunit is not used anymore. Testing is now done with ctest.
libwinpr: fix test build on Mac OS X
libfreerdp-core: improve options for connection cookie
libwinpr-sspi: fix SuppressExtendedProtection
Merge branch 'channels' of github.com:FreeRDP/FreeRDP into channels
xfreerdp: fix building without XCursor support
utils/args: fixed formating
util/args: fixed when using --from-stdin

- Discard new lines with scanf.
- If domain is left empty (STRG+d pressed) clear EOF flag - this fixes
  an enless loop in xfreerdp on OS X when input is required after a certificate
	warning.
xfreerdp: fix for endless loop with --from-stdin

If --from-stdin was used non-interactive (e.g. in a script
echoing connection parameters) xfreerdp looped endlessly
when a certificate needed to be trusted because
fgets returns eof.
Now a hint is printed that xfreerdp should be run without
--from-stdin to set the certificate trust.
MDL-27037, wiki does not support visiblegroups functionality
MDL-29224 navigation: Navigation now respects a modules onclick event when preparing navigation nodes
MDL-29677 unit tests - missing global was causing tons of incorrect debugging info
MDL-29454 Fix coding style before trying to do the real fix.

All the changes here should be whitespace, /// -> // or adding boilerplate comment.
MDL-29454 qtype admin page does not work in some browsers.

The problem is that they were using input type=image, but they trying to
process that using optional_param. With input type=image, Firefox sends
inputname.x and inputname.y POST data, not inputname.

This fix is done by back-porting the working code from Moodle 2.1, so
the changes are bigger than the minimal changes required to fix this,
but that will make back-porting any future bug-fixes will be easier.
MDL-16553 Assignment, student view: show response files when no grade available
MDL-29668 xmldb editor - fix PHP generation for foreign-unique keys
MDL-27278 navigation: Admin users can now set the home page preference like normal users
MDL-29672 user: Fixed user edit page for non-admin users
MDL-28582 course-report: Added a nothing to display notification to the outline and complete activity reports
MDL-29690 fix usage of select all/deselect all in choice reports
MDL-29564 Assignment: Fixed a fatal error caused by a missing include
Merge branch 'MDL-29677_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
Merge branch 'MDL-29668_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE
MDL-29661 - lib/googleapi.php - Switch to SSL urls

I am not sure why I did not use these in the first instance, I don't
think Google supported SSL in the first versions of their API.

They do now, and it seems that this week they stopped supporting non-ssl
requests.
MDL-29496 Search, Course - Code applied from patch to allow courses with a blank summary to be found in searchs - Thanks to Andrew Nicols for the patch
MDL-29690 mod_choice: Fixed regression from merge conflict
Merge branch 'MDL-16553-20' of git://github.com/bostelm/moodle into MOODLE_20_STABLE
MDL-29564 Assignment: whitespace fix
Merge branch 'wip-MDL-29672-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE
Инструменты из меди.

Добавил полный комплект инструментов из меди. Меча ещё нет.
Нужно обсудить Кирку, похоже я знаю как сделать, чтобы добывались только нужные нам блоки.
Disable the ffserver and ffplayer since we don't use them.
Watchdog configured (120ms timeout). Untested implementation of command receiver. Firmware reset via bluetooth implemented.
added handleJoin() + associated variables. it doesn't work though
remove html_utils in completer plain
simplify code in simple completer
remove unused variable
cancel on focus out, simple completer
copyright, make cancel_completion public, compact logic
use jquery-ui classes
prototype sticky notification
add kernel notification widget
separate kernel notification from save/load notification
Enable ARC on MagicalRecord 1.7.1, as the non-ARC code leaks.
[Update] A2DynamicDelegate (2.0.1)

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
try to fix problem with encoding on ribinius

according to this post: http://troessner.wordpress.com/2011/07/18/ruby-1-9-invalid-multibyte-char-us-ascii/
it may help to solve https://secure.travis-ci.org/#!/CocoaPods/CocoaPods/jobs/1562847
[Update] GRMustache 5.4.2
[Add] FoundationExtension/UIKitExtension

FoundationExtension/UIKitExtension is snippet collection for Foundation/UIKit
Merge pull request #645 from youknowone/FoundationExtension

[Add] FoundationExtension/UIKitExtension
Revert "Added War and Peace"

This reverts commit cc5f28dd1025fd26ef65c58b46615e5bd219f080.
Revert "Revert "Added War and Peace""

This reverts commit 994af40d619382aff95e5c7ade29cb63151c5f20.
Removed conflict
Revert "added ending border on caesar.txt"

This reverts commit f57c604dbf18ee6721334967c0a9d5016a2065db.
Removed conflict
Revert "removed extra new line"

This reverts commit 9a974946f7af7e482deeae804e68fe793467727c.
Added OpenFIMG (from tom3q)
Added ARMv6 WebRTC (from unforgiven512)
Pointed some to my repo
Slightly satisfied
FIX: removed hardcoded list with space tokens
Merge pull request #948 from ubeda/spateTokenFIX

FIX: removed hardcoded list with space tokens
fix
Merge pull request #1046 from fstagni/fixTransformationDB

Fix for TransformationDB
new hotkey for awesome and 1 more str for conky
Введение скина аддона аукционатор в стандартный скин АХ
Load textures with SDLImage library

Textures will be loaded with the SDLImage library if version=SDLImage
has been set
Merge pull request #2 from OlaOst/master

Load textures with SDLImage library
fix for win32 build
res: Stringify array values
lotoplus json update at Oct 23, 2012 11:12:20 PM
list of files updated for 20120530 at May 30, 2012 9:46:24 PM
list of files updated for 20121128 at Dec 1, 2012 4:57:23 AM
updated: TODO.md
fixed versions for next release
make optionsmodel query real proxy state for ::data()

- don't rely on the QSettings for cases ProxyUse and ProxySocksVersion and
  query the real values via the GetProxy() call
- add a missing "succesful =" for case ProxyUse in ::setData()
make CBase58Data class use zero_after_free_allocator

- this way there is no need for an explicit destructor, who does the same
  thing anyway
Qt: replace some tabs by spaces in the project-file
Begin github_connection model. Still needs to get file content.
Finish all shas and create_new_hash method
Fix README typos
Merge branch 'master' of github.com:DomKM/git_party
Add github_api gem
Merge master
Add Github api methods
Set up API calls in repo.rb
fixes conflict
fixes conflict
* Instructor fix
Make sure that any stdout output is shown correctly when things go wrong, and include the exit code. Stderr is automatically output.
REALLY fixed the read me.
up module ctools
up module context
up module rules
up module features to dev
up module field_group to dev
Merge branch 'core'
up drupal 7.15
up module rules : forgot to remove file
Merge branch 'core'
Use tagged components
[maven-release-plugin] prepare release EASYBEANS_UTILS_1_0_0
[maven-release-plugin] prepare for next development iteration
Physics corrections and improvements. Added support for some future
features. Modified some stuff to use vecmath; will eventually replace
all LWJGL vectors and matrices
Merge pull request #546 from FHenry/develop

Manage Extrafields deletion for contact
Fix: Missing translation
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
Fix: dynamic menu does not works with auguria. Add a temporary fix.
Fix: showrefnav fails with multicompany
Merge pull request #548 from simnandez/develop

Fix: showrefnav fails with multicompany
Fix: Missing drop of table deprecated into 3.2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
New webservice method to create a thirdparty with contact and user
Merge pull request #549 from jfefe/webservices

New webservice method to create a thirdparty with contact and user
Fix: Maxi debug of holiday module
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
Prepare freeze of 3.3
Fix: syntax error
Fix: FTP modules fails with servers than need passive connection
Fix: FTP login
Add option to have alternative method when ftp does not work
Fix: Several fixes to avoid PDF lib conflicts.
Fix: Exclude external modules table
Fix: Removed warnings
DB/SAI: Fix up quest 9312 "The Emitter"
Merge remote-tracking branch 'upstream/master'
Implementing split dmg cap to Divine Sacrifice. Author Tibbi

+correcting previos sql

Closes #6024
Add a simple scoring algorithm to make it more fun
Refine the scoring mechanism and suggest the best words
Make move plugin fill in the 'output' field with file destination.

git-svn-id: http://svn.flexget.com/trunk@3145 3942dd89-8c5d-46d7-aeed-044bccf3e60c
Make move plugin also fill 'output' field in test mode.

git-svn-id: http://svn.flexget.com/trunk@3146 3942dd89-8c5d-46d7-aeed-044bccf3e60c
Added numLikes and numPosts methods.
Work on craft import
Fix Bug : replace the userInfo popup
Try fix public build. Remove potentially bad character
fixed up the maven plugin after Pavel's changes
added extra diagnostics on assertions so its clear which bit of code caused the problem
simplified the code to try get the JS generation to work (seems to not like fully qualified classes)
added a (currently disabled) test case for compiling the JS code from the kotlin-js-library maven build
Merge branch 'master' into dev
added links to getting started guide & API docs
added request.getParameter() code for more accurate comparsion - thanks for the heads up Cedric!
added links to getting started guide
added an experiment of compositional map/filter style functions on nullables to mimick Scala's Option behaviour without any wrapper classes
tidied up the comments
KT-1508 jet.Number -> j.l.Number
Merge pull request #24 from Frostman/arrays_kt_fix

Arrays.copyOf() and .copyOfRange() should return not nullable result
enabled number formatting in LocaleFormatter tests now that issue KT-1583 is fixed
switched back to cleaner nested functions & used the same name
added a little test of showing how we can use the standard kotlin functions and standard library from Java
Merge branch 'master' into dev
Added URL instead of IP on connecting to server.
Merge branch 'master' of https://github.com/Fumler/Immunity
Pridany JSP page
meta changes

line endings, gitattributes...
qt with webkit support
get pg passwd from backup if exist or change pg passwd, on upgrade/reinstall
respect indentation
Merge pull request #392 from simod/master

in case of upgrade/reinstall use the existing postgres password
Upgraded geonode-avatar to 2.1.1
Merge branch 'dev' of github.com:GeoNode/geonode into dev
Ajout des sources qui étaient sur SVN qui avaient été modifiées par Robin. A toi de jouer Robin ;)
modif rapport
Bug #463969 - Allow Selection of Multiple Transactions During Reconcile
Bug #628402 - Ctrl-F in Reconcile doesn't invoke search, but (F)inishes
the reconciliation

Author: Robert Fewell <14ubobit@gmail.com>

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22312 57a11ea4-9604-0410-9ed3-97b8803252fd
[Bug #674862] Gnucash crashes after creating a new SX using the Mortgage Wizard and SQL Backend 


Special-cases dbi_result_get_datetime returning -1 to work around a bug in MinGW's implementation of gmtime().

[BP]


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22188 57a11ea4-9604-0410-9ed3-97b8803252fd
Changed csp_debug_level_enable[] to be unsigned char instead of int
margin 0 for messages
message styling
Add sdl_image_set_img methods to SDL_Image
Document Plane and Rocket objects
[0.153]上層チップ設置時 可能かどうかをチェック, timer_mod追加, モジュールのincludeを整理(calc内で使用するモジュールをcalc_hでinclude), fpsfixモジュール内で使用していたtimeBeginPeriod/timeEndPeriodを廃止, debug描画を別ファイルへ隔離(debugdraw.hsp),
testing new twitter announcement hook!


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2804 d19b8d6e-7fed-0310-83ef-9ca221ded41b
minor doc update

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2805 d19b8d6e-7fed-0310-83ef-9ca221ded41b
revert accidental commit of half a line


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2806 d19b8d6e-7fed-0310-83ef-9ca221ded41b
Merge remote-tracking branch 'git-svn'
wps office
alchemy added
adicionando a barra flutuante
Added Spring Security Database based Authentication with
password hashing.

Signed-off-by: robinvk6 <robinvk6@robinvk6@gmail.com>
Change-Id: I7d30fb12e435587289efa317fefe6ae45984d804
Signed-off-by: Scotty <Scotty@CRYSIS>
ilastik-build-all should produce a working *.tar.bz2 now
Added the changes for independent task selection.
Prepare for lein
Downgrade finbugs
Add default params to realm config. Spell checking.
related to #7.
Drop unused param in config. Add sql files to install.
Non java fixes
Merge branch 'master' of https://github.com/JMaNGOS/JMaNGOS.git
Revert "Downgrade finbugs"

This reverts commit 1ecb8f58336a77e738ffb245dbb56d26b0d18e52.
Integrate checkstyle plugin
Try to fix few FindBugs issues and see what's now in the jenkins
Another one test
Fix typo
Drop unused xml. Fix style.
Merge branch 'master' of https://github.com/JMaNGOS/JMaNGOS.git
Added IntelliJ project files ignore (create it from maven project!)
Some useful stuff
Groovy added to maven deps
JZLib dep added to the pom
Changed from static fields to enum
Enum supported getters/setters
Fast ingegrated hibernate...
Typo fix
clean up , hg_creator 
uff
Added information on Optimization and example code
new readme
Merge branch 'master' of https://github.com/JimLiu/WeiboSDK
Updated some more commands and fixed some issues in both Player and
Alliance Managers
go to V1.1
Use require.resolve to find path to kue, don't assume it's under our node_modules/ directory
LoginEasyB:stä korjattu ikävä bugi
viikon 4 ensimmäisen tehtävän projekti
lh4/LoginWeb2 pom cleanup
pom.xml:n versionumero muutettu
mockito-proj added
mockito-proj kommentit
nhlstatsreaderin spring-versio lisätty
verkkokaupan mallivastauksia
Merge https://github.com/mluukkai/ohtu2012
viikon 3 kirjaus
some linalg/linalg_dense touch-ups
don't use the now-global name ctime in version.jl
invperm: avoid expensive isperm check.

There are two (non-exclusive) ways in which the input can fail to
be a permutation:

1. it contains a number outside of the range 1 through `length(a)`
2. it contains some number in the range `1:length(a)` more than once

In the former case, you'll get a indexing error; in the latter case,
you'll have some element in `b` which never gets assigned.

Sorting the permutation is an O(n log n) check. This way of checking
lazily that the input is a permutation is O(n), so somewhat better.
The bigger win is really that it doesn't require creating an extra
copy of the array just to sort it.
Pkg: force strict inequality when solving for weights

The system encountered some cases where fractional solutions were
allowed and making these inequalities strict disallowed them. We
may just need to use a real ILP solver here eventually.
Intiliaze project upload
algin code
more cleanup
...
Merge branch 'scenegraph' of ssh://github.com/KPWhiver/DimLib into scenegraph

Conflicts:
	src/scenegraph.cpp
jason commited 5 testdoc files
Add Foreman integration code to rpm spec
Fix all of the failing tests
replace NSURLRequest to NSMutableURLRequest
ajout getFilePath
Merge branch 'master' of github.com:KenTiN/PolyPeer
ajout lancement d'exception en cas d'absence du fichier a deployer
Merge branch 'master' of github.com:KenTiN/PolyPeer
Fixes #62 Added editing of sorttitle
Use the latest version of auto-complete, it works well with the latest version of yasnippet
Addition of configs for icalendar exportr
Addition of a predicate to know if a task is errand
Addition of a function exporting as ical the errand tasks
Correction quote
Update jQuery, jQuery UI & Tweater Bootstrap
Merge pull request #60 from KurtStam/master

SRAMP-82 switching to filesystem based jcr persistence
SRAMP-76 simply setting the war name to 's-ramp-atom' and adding the
version info to the manifest
updating the license header
Merge branch 'master' of git://github.com/Governance/s-ramp
Relevancy algorithms.
100% shopping-diaolgue
Update 2/0000/0343.txt
Manually committed from: https://github.com/pilladoll/B2W2spa/commit/57233ca8b6c96911b051177955926882c714680f
change SudoEdit.vim to sudo.vim
run tests quietly

Otherwise Travis-CI's build infrastructure rejects the test-suite as it
considers volumnious files as failed tests..
Fixes an unknown pragma warning.
Fix issue 7745 Regression(2.059beta) Methods defined in external object files when a pointer to it is taken

This also adds a nasty test case of bug 4820 to the test suite.
fix Issue 6659 - Destructor in range foreach called after initialization
Revert "Revert "Allow property function has two arguments""

This reverts commit 18ead537ad7b37b5203e35a478883ad90b06dd49.
Revert "Revert "fix Issue 7722 - Refuse normal functions to be used as properties""

This reverts commit 55e2a21b43a585cc3175542c0a89c17785631773.
Revert "Revert "Refactor for UFCS property getter/setter resolution.""

This reverts commit b034d8b20013ce28671a0a33e1173c1dc0690a8c.
fix Issue 7608 - __traits(allMembers) is broken
fix Issue 7751 - [ICE] From auto and forward reference
fix Issue 7694 - Internal error: e2ir.c 1251 when calling member function inside struct via alias param
Merge pull request #832 from 9rnsr/fix7608

Issue 7608 - __traits(allMembers) is broken
Merge remote-tracking branch 'upstream/master'
Merge pull request #830 from 9rnsr/fix_ufcs

Issue 7722 - Refuse normal functions to be used as properties
Fix issue 7751 [ICE] (Regression 2.059head) From auto and forward reference

Basically the same bug as 7681. It's an 'alias this' issue.
Fix issue 7782 Regression: ICE with wrong import syntax
Fix issue 7789 [CTFE] null pointer exception on setting array length
Merge pull request #845 from donc/ctfe7789

Fix issue 7789 [CTFE] null pointer exception on setting array length
Merge pull request #844 from donc/regression7782

Fix issue 7782 Regression: ICE with wrong import syntax
Merge remote-tracking branch 'upstream/master'
Merge pull request #827 from 9rnsr/fix7694

Issue 7694 - Internal error: e2ir.c 1251 when calling member function inside struct via alias param
Merge remote-tracking branch 'upstream/master'
placing Category list for new Phrase
Silly 'if' found and removed
Budget-Folder-View implemented
Main functionality implemented
handle errors during directions filtering
added help page placeholder, fixed position of navigation elements and made header navbar expand over content
kmer profile now floats
fix spelling error
Merge pull request #75 from teharrison/develop

minor api bug fixes
Speedup more
Committing hive-udf
Function Resolver
Added blueprint stylesheets, an FAQ page and updated the Gemfile to include Autotest gems in the test environment.
Support bare interpolation in attribute selectors.

Closes #331
Declare invert().
Merge branch 'stable'
Fix Tree#inspect on Ruby 1.9.

1.9's #inspect defaults to #to_s, which fails on non-static trees.

Closes #367
Fix the Listen plugin.

Closes #372
Closes #370
Closes #362
Merge branch 'stable'

Conflicts:
	doc-src/SASS_CHANGELOG.md
Make keyword argument parsing stricter.

Closes #328
Merge remote branch 'origin/master'

Conflicts:
	doc-src/SASS_CHANGELOG.md
Merge remote branch 'origin/stable' into stable

Conflicts:
	doc-src/SASS_CHANGELOG.md
Merge branch 'stable'
Replace the Listen plugin with an implementation of the Listen callback
Merge branch 'master' of github.com:Maher4Ever/sass

Conflicts:
	lib/sass/plugin/listener.rb
Occ. at same locations now agg. by latlon; multipoint latlons and aggs ordered same way (#3)
Fixed problem with 'Daily' and '15 minutes' updatings
List of weather forecast is amost done
Merge branch 'bb' of github.com:Meecast/meecast into bb
Fixed icon ICY in Epona set
Merge branch 'master' into bb
wolf: added a top nav item, changed hover color
Calculating button position if sidebar collapsed/opened

Fixes #880
Marking first imported style as default style

Fixes #878
Fixed .preInput buttons

Fixes #879
Add UserGroup::getGroupByID()
Make it possible to use Popover when an Overlay is active
DateUtil::formatInterval now supports dates in the future
Fixed dropdown positions
Merge branch 'master' of github.com:WoltLab/WCF
Fixed width calculation of table cells
Adjusts the height of multilingual input fields

This way, button and input field have the same height which looks way better than if the input field isn't high enough.
Merge pull request #882 from Gravatronics/enhancement/multipleLanguageInputInputHeight

Adjusts the height of multilingual input fields
Replaces count calls with semantically correct empty calls
Fixes typo
Merge pull request #884 from Gravatronics/enhancement/countToEmpty

Replaces count calls with semantically correct empty calls
Removing psych dependency
Implemented AF 3 correction limits in AZ1E400C.xml posted by mikes at RomRaider.
Implemented AF 3 target comp limits in AZ1E400C.xml posted by mikes at RomRaider.
initialise
README UPDATED
Merge branch 'master' of github.com:MichaelHirn/elc
Advertencia Cerrar Ventana Principal
Re-create required directories upon bootstrap

TODO: check if the list of such directories is complete
jsonrpc: only initialize the (Video|Music)ThumbLoader once when retrieving artwork for a list of items
[darwin] - allow building depends against ios6 sdk
[ios/atv2] - disable usage of fastmemcpy - it breaks build on apples newest buildtools (xcode4.5/ios6 sdk)
[darwindeps/python] - fix missing _environ symbol which was resolved by accident in older darwin versions (but doesn't work anymore on osx10.8 and ios6.0) - see http://bugs.python.org/issue1602133
[lang] fixed: removed translator's data along with email addresses from PO files to avoid spam
WIP
change implemenation to non-template and add GUISetting stuff
wip
utils: add IXMLSerializable
[win32] update VS project files
[WIP] settings: define and read settings from XML
jsonrpc: add tag support (get, set and filter) for tvshows and musicvideos
Fixed issue with linking to PLS
Use C++ headers rather than C headers
Update rules/mapping_and_modding/rules.markdown
-ggdb in Makefile
caught a missing pthread_cond_signal() in main()
rework while-loop in main()
-lrt for mq_open()
start to implement message queue
begin to rework create_cmdserv()
it looks correct apparently
remote ret = -1 in enter_state()
Merge remote-tracking branch 'origin/master'
-Moved chat box item style to Light.cs.
-Added functionality for all events (hid Spawn event for now, due to spam-yness).
-Organized light style to load all colors and brushes auto-magically.
-Chat Box height now saves to the configuration file.
- Removed old UI projects.
- Moved current UI project to Old status.
- Created empty new UI project.
Merge branch 'master' of github.com:Myrcon/Procon-2

Conflicts:
	src/Procon.sln
some fixes at the server
run update check *after* running custom configuration scripts.
This means we are running it after $PATH has potentially been set up,
which means it's more likely that commands like "git" will be found
Add my (cypher's) zsh prompt

Based on Evan's prompt, it uses colors, shows the exit status of the
last command if it was non-zero, and displays "#" when running
with elevated privileges
Make "-" an alias for "cd -" (cd back to previous directory)
add xiong-chiamiov theme
Merge branch 'master' of git://github.com/cypher/oh-my-zsh into cypher/master
Fix cypher's theme for older zsh versions
allow case sensitivity to be toggled
should probably use the value of CASE_INSENSITIVE
Add my own theme
Replaced source with .
Added git diff for vim (gdv)
Added ack-grep searching
Added more aliases for Rails & git
Merge branch 'cypher/master'
Merge branch 'master' of git://github.com/wezm/oh-my-zsh into wezm/master
Added some comment
added gcp alias (git cherry-pick)
Renaming script/server --debug alias to ssd to avoid conflict. Closes #1
extended path variable, temporary
Fixing merge
remove project dependency
StructureParser: minor cleanup
improve names of tests in StructureParserTests
restore duplicate name checking to StructureParser
tweak error message to keep up with StructureParser changes
Erste Ballbewegung (Als Vorlage)

Erweiterung um eine zufällige Ballbewegung beim Start.
Das Ganze muss jetzt noch so erweitert werden, dass der Ball kollidiert
usw. Machen wir dann, wenn wir Janniks Rahmen vernünftig drin haben.
@修改makefile文件
	1）改变库这间的依赖性
drop support for extern function from stage 1
Remove 2010 from the NuGet description text.
Первичная настройка дизайна и маршрутов.
Первичная настройка дизайна и маршрутов.
Деплоим...
fixed agent logout during agent to agent transfer

Set gen_media to handle it's side properly (setting agent state and killing
outband ring pids), and freeswitch_media to handle it's side properly (
killing channels).
Fixed badmatch when call gets requeued due to unexpected agent death.
Options parsing demands unnecessary configuration if PKCS11 is used

In the old patch the if incorrectly closed the outer if condition.
(closes ticket #231)

Trac-ticket: 231
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: David Sommerseth <davids@redhat.com>
Message-Id: 1350470774-12511-1-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/7095
Signed-off-by: David Sommerseth <davids@redhat.com>
openvix: build 297
Merge remote-tracking branch 'pli/master'

Conflicts:
	data/setup.xml
	lib/python/Screens/InfoBarGenerics.py
Merge branch 'master' of github.com:OpenViX/enigma2
Teleport animation

Basic teleport animation. Prepairing for weapons rework.
Modificada la parte visual
Updated version number
Updated click button to edit addon
Updated version
Rebuilt packages
Merge branch 'master' of github.com:PANmedia/Raptor
Merge branch 'master' of github.com:PANmedia/Raptor
Updated packages
added tests to deal with empty selection
Improved travis-ci integration
README を更新。
gotta add data to the listview adapter and update the ui and use the
custom layout for the adapter loop at assignment 2
Missing default.args
сделал чтобы потенциал округляло в ближайшую сторону, а не в большую
first commit of topics/new_data branch
update to new data container
Update to eos driver to use new data container layout
Rebaselined tests for new data container and made some small improvements.
fixed remaining benchmarks
Merged the topics/new_data branch with the master.

This branch speeds up simulations quite a bit because the data
layout for the DataContainer object was changed and made more
efficient.

Also updated the minor version number to 1.1 since some APIs changed.
easy_test
Merge branch 'master' of github.com:Peiyun/Database
ajout de fichiers préliminaires

première version HTML
première version CSS
dossier "images" avec 3 logos
Changed contextual inconsistencies in the logging.
Implemented CopyObject emitter
Fixed old client bug(typo?) (removes two not found errors from client…
@documentation cleanup
enabled ido for yassnippet completion
Added rs-mode along with file templates.
Added seperator snippets.
recompiled clementine
updated transgui
Updated config to my likings
support the notion of returning an accepted object
Add credentials helper for mac os
Update to reflect renamed RKDynamicObjectMapping class. closes #766
Remove drawing of MTVs and Boundign boxes.
Verfügung angepasst
goodbye RubyForge
setup activities and types. seeded data.
Merge branch 'dev' of github.com:RudyOnRails/10k into dev
Added ability for admins to change usernames and emails.
Added ability for logged in users to change their passwords, and blocking them from viewing or changing others' passwords.
Added small utility js script to make sure change password box is cleared.
Updating readme and deleting more unneeded extensions.
index2.html Header
init
saber clean done
push to rubygems
update README
minor improve
download function completed
update README
rename download action to add
saber-server and client
saber-server alpha completed
change configure file to /etc/saber
saber-download complete
alpha one completed
a
prepare to release
bump to v0.0.2
next time: remove action.php
mini fix
bump to v0.0.3
add rutorrent plugin
folded all ajax-toggle function into one loop

DRY
added check if gdocs report has been created
Merge pull request #135 from vals/master

Hotfix for gdocs creation check
Updated specs, re-enabled broken element-wise list operations
Add *.suo to gitignore
Initial code commit
Working on new table view
steps binded to px coordinates
Мин кол-во  населения при поиске кормушек поставил 1500
Добил функцию запуска программы из-под другой учетной записи
Добавил Changelog.
Merge remote-tracking branch 'origin/master'
Add debug mode flag and change the type of environment object from association list to hash table.
Quicken the build process for testing
Drain pending writes before ending the request to avoid AVs.
Small tweaks to api docs.
Fixed remaining fxcop errors in core.
Fixed last fxcop errors.
Don't drop a worker when a subscription fails to perform work.
Dispose the subscription if we failed to invoke the callback.
- If invoking the terminal message fails, ignore it.
Added "Set PC to Address" right click option in disassembly
adding sample tiles file
Clean World DB
built.
Merge branch 'master' into gh-pages
Switch back to VCS for CtrlP, configured to show untracked files too.
now GET for a single file doesn't necessarily depend on meta server; putting a few common functions in utility file
그룹원 리스트 FLOW 수정
add a test for ajaxMethod.abort()
Return the original promise so abort() is not lost.

jQuery 1.8 now returns a new promise from .then()
Divided the "Help & Usage" tab into two separate tabs

Divided the "Help & Usage" tab into two separate tabs.
Finished 8_6, no need for find module in 8_4 or 8_6
Started sanity-checking configuration file.
Fixed all sorts of readability problems.
Fixed all sorts of readability problems, again.
Fixed all sorts of readability problems, again++.
More general way of making charting ddirectives wait for ready scoope
updated Makefile, File, JointNode, Skeleton, Matrixf, implemented C++11

Makefile now handles compile options as variables, to save effort.
Makefile now cleans up main.o and the test executable.
Makefile implements C++11.
Collada was removed.
File now handles ImportCollada, and also has a type-independent
Import class which checks for existance, then analyzes the file,
and forwards it to the correct import function, returning the
return value from the forwarded function.
JointNode and Skeleton now have move constructors, and have blocked
copy constructors (there should only be one of any instance of these
classes; if you need to access the same instance in two places, use
pointers, or move it).
Matrixf now implements C++11, using correct move semantics for
improved container function.
changes for tanukis
Merge branch 'master' of https://github.com/TekNoLogic/play
Introduction almost done
[mr2310] WorldStateMgr implement part 15 - implement phase support (mostly for feature) - correct DBC loading - support for multiple view for one WS - final correct capture_point checking of condition - some cleanups.
Merge https://github.com/mangosR2/mangos
Random des cartes au debut
Fixed typos in write_manifest
Adding proper MSPSDK directory so that it would not break on CI Server
updated installer graphics
Fixed an issue with effess.py not being copied to built directory
Added default return value to solve compiler use case
Upgraded Mac OSX functions to solve deprecations.

* Rewrote Save As Dialog
* Rewrote Open File Dialog
Changes version to 1.3.0-beta for sdkinstaller
Removed mobile sdk references
Cleaned up SDK Installer
Some poco header refactoring
Merge pull request #49 from motin/typos_in_write_manifest

Fixed typos in write_manifest
Last fix for 1.3.0-beta for sdk installer
Merge branch 'develop' of https://github.com/TideSDK/TideSDK into develop
Remvoving Titanium - partial
Removing Titanium from ui module and monkey module
Removing Titanium from app module
Mac specific Titanium -> TideSDK renaming
Fixed OSX installing SDK to ~/Library
Removing more Titanium paths and comments
Cleaning up Installer with TideSDK name
clean and lint network host tests
Also rockspec
Correct check for whether __eq is applicable

For that to happen, both objects metatable need to be same, one
table having a metatable with __eq is not enough.
Use identity for comparison when possible

There's no need to recursively compare tables when we know
that they are the same identity-wise. It saves us some work,
but what's more it also makes it usable for tables containing
LuaJIT cdata. Deep comparing such tables will always fail, since
cdata is not comparable.
Merge pull request #19 from nilnor/fix-table-comparisons

Fix table comparisons
Remove self argument for spy.new

It's not needed, and not consistent with spy.on either. What it would
be used for, accessing its own table, is already handled by a local
forward declaration.
Fix chained assertions not being evaluated

E.g. is_true, is_not_nil, etc. Assertions using chains would
previously always succeed.

Also rewrote the logic for parsing out the valid keys from an
assertion string.
Merge pull request #20 from nilnor/no-self-for-spy-new

Remove self argument for spy.new
Merge pull request #21 from nilnor/fix-chained-assertions

Fix chained assertions not being evaluated correctly
Merge branch 'master' of github.com:Olivine-Labs/luassert
update to 1.5
added is_table assertion
Merge pull request #24 from JocelynDelalande/patch-1

added is_table assertion
* Simplifly impresor functions
* Remove functions to store pointer
* Separate sistema files into material and experimente
* Material::state no longer evaluates applied external field
few code style changes
Remove thermostat function use step2vec only
Organize header files and includes
Test header & make tester class friend of material. This way it can test it's behaviour
Makefile includes valgrind check
Organize plots sources
LCD Interface Header file
Removed global definitions
Password reset functionality (not tested).
directory handling started
directory default handler works with Lua
directory config file parser started
IN PROGRESS - issue GWDP-230: First cut at cache population: Montana,
Minnesota 
http://internal.cida.usgs.gov/jira/browse/GWDP-230

Springify data broker creation.
IN PROGRESS - issue GWDP-230: First cut at cache population: Montana,
Minnesota 
http://internal.cida.usgs.gov/jira/browse/GWDP-230

Added prefetch servlet that uses (new) prefetch method in broker.
Changed well list servlet to generate URLS for prefetch if given
parameter servlet=prefetch.
OPEN - issue GWDP-234: Harvester fails when agency code contains space 
http://internal.cida.usgs.gov/jira/browse/GWDP-234

Fixed.
Removed a few tests, modified the dataset introspection test
fix HtmlWriter instance
call CollectionUpdater destroy from CdmInit.destroy
fix invDeatureDataset.getGridDataset(FILE)
in fgs2 --dir-path option: interpretation of path regex corrected
PartitionGraph demo.
./link is now ./setup and is better
WebServer: switch to html5 (WIP), use html5shiv
fix unitialized variables
Get rid of an unneeded var by using MAKEINTRESOURCE directly
float
update ffmpeg (n0.8-17308-g0156dd6)
Update Little CMS to v2.4 (git e4624c8)
update TreePropSheet from TortoiseSVN
update Logitech SDK to v8.00.100
move the ResStr define in DSUtil.h instead of duplicating it
consistent constructor style
fix typo in comment
remove gdiplus.dll and psapi.dll from delay loading
RFT: changed t3lib_div::readLLXMLfile to t3lib_l10n_parser_Llxml for compatibility with v6.0
修改stylerc里面的一点问题
Changed to white buttons.
fixing and adding to test
Fixed code compilation without fpermissive flag.
Removed Winapi, but now library don't work - work in progress.
Some translations.
building import script
fxied idxPAram
bettwer management of import dirs
seems to make the row structure correct
fixed all the same son problem
changed symbol names from son to child to be more standard
using childsPrototypes keys to disciminate between real childs (under rowes) and its prototypes
getting al lelements also for rows with idx param
can import object modueles
services imported without initial conf
import services using pritnableNames for defaultService, preserve ids
simplified and clear conf
filled conf tree with composites correctly (not composites with parentRow
import keys subdirs ok
import network
import firewall
cmdli argument of backup file
reordered methods
running initialSetups for default services
dataform import done
added angular control to side thruster AI
delegate/function implementation
Modified the way how module names are generated in dependency of the base directory you pass to the GetModuleName method: The file name is returned now when the file's path and the base directory don't match.
Merge pull request #3 from aaronschmitz/master

Improve Code Style
added README, tree-->graph
Update graphexec/src/README
Typographical corrections.
Renamed the example config file for consistency.

Signed-off-by: Austin Beam <austinbeam@gmail.com>
Added the ability to manually specify URL & API key.

Also modified the default location of the config file for consistency.
Signed-off-by: Austin Beam <austinbeam@gmail.com>
Modified the config file location for consistency.

Signed-off-by: Austin Beam <austinbeam@gmail.com>
Initial commit of install.sh.

Still a little messy, but confirmed to be working at this point. This
install script makes life easier for installing sab_api. It used links
rather than copying files to ensure easy upgrading.
Signed-off-by: Austin Beam <austinbeam@gmail.com>
Initial commit of the sab_api bash completion file.

This file can and will definitely be improved upon, but even in it's
early stages is a big improvement over no completion at all.
Signed-off-by: Austin Beam <austinbeam@gmail.com>
Modified help to include the GitHub link.

Signed-off-by: Austin Beam <austinbeam@gmail.com>
Updated the README with some useful information.

Signed-off-by: Austin Beam <austinbeam@gmail.com>
Made some more README additions.

Signed-off-by: Austin Beam <austinbeam@gmail.com>
Ensured that changes to the config path during an

install are populated to sab_api as well.
Signed-off-by: Austin Beam <austinbeam@gmail.com>
no default display type, use template defaults instead.
MDL-32126 - data - backport of advanced search re-write
MDL-30478 - wiki - Fixing up group problems when viewing and creating wiki pages.

Thanks to Matt Kolb for his contibution.
MDL-28676 add hack mysqli php ext requirement for upgrades to 2.x

The mysql extension is not supported in Moodle 2.x, this hack should inform admins that they must add mysqli support before doing 2.x upgrades.
CONTRIB-3662 Hotpot: fix fatal error during restore and general tidy up of spacing
Merge branch 'w21_MDL-28676_m19_mysqli' of git://github.com/skodak/moodle into MOODLE_19_STABLE
weekly release 1.9.18+
csrf for mailx
script for remote plotting with mayavi libs
remove corporate link on about'
Change link to .ics
fix import user to show error
add asn files for constraint.
update default commitlog segment and total size
patch by jbellis; reviewed by vijay for CASSANDRA-4422
Merge branch 'cassandra-1.1' into trunk
improve "nodetool ring" handling of multi-dc clusters
patch by dralves; reviewed by jbellis for CASSANDRA-3047
Fix for Test failure: remove hardcoded values in CLT
(cql3) Support ORDER BY when IN condition is given in WHERE clause
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4327
changes required for CASSANDRA-4327 with 1.2 changes to CQL3
Merge branch 'trunk' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
remove unused import
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges
Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges
Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools

Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
make nodetool work (sort of)
calculate pending boostrapping ranges one node at a time instead of token
put back memoized sortedTokens
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path
Added default-line-ending=unix after wasting two hours with a carriage return problem
update for Mountain Lion
Add depends_on libsamplerate
Refactoring to base classes
extend session timeout whenever GET / is requested
Used PatientPosition DICOM tag to solve supine vs prone issue.
More fixing of issue #14 - giving up on backwards-compatibility.
Added sma function and initial Trade structure
removed working-dir from experiment config
细分打出、提供和弃置
lua/ai/smart-ai.lua:564: in function 'sort'
	lua/ai/smart-ai.lua:2131: in function 'getCardNeedPlayer'
	lua/ai/smart-ai.lua:2212: in function <lua/ai/smart-ai.lua:2202>
	[C]: in function 'pcall'
	lua/ai/smart-ai.lua:118: in function <lua/ai/smart-ai.lua:102>
lua/ai/smart-ai.lua:566: bad argument #1 to 'sort' (table expected, got nil)
askForYiji
stack traceback:
	lua/ai/smart-ai.lua:122: in function <lua/ai/smart-ai.lua:102>
Event stack:
真·小型场景
我们现在的角色数足够支撑起20个场景，
随着人物增多，这个小场景就能慢慢丰富起来。
也能让玩家知道很多他们不知道的水浒故事。
我觉得这才是水浒杀里小场景的意义。
而不是为了一时的爽，去吧各种不相干的人物构建到一起。
狼性执行六大步骤➹
1、目标到位，干活有味。
2、人才到位，万事具备。
3、授权到位，总裁不累。
4、流程到位，傻瓜都会。
5、检查到位，结果做对。
6、奖罚到位，管理作废。
亲王选择奖：“疼吗？”
“嗯………” “要不算了？”
“别！”
——于是华佗点点头，拿起钢刀继续为关羽刮骨疗毒。
喝酒容易脸红的人正是代谢乙醛存在缺陷的人，
这使得他们更容易受到乙醛的侵害——即便自我感觉没醉。
许多人依据自己是不是醉倒来判断该不该继续喝，
甚至有人认为经过一段时间的锻炼，酒量见长就没事了，这些都是不对的。
所以，喝酒脸红的人还是不喝或者少喝为好。
狄仁杰和元芳在山坡上搭帐篷露营！
入夜，狄仁杰醒来，用肘部弄醒元芳：
元芳你看！天上有什么？元芳：一弯明月！
狄仁杰：这事你怎么看？
元芳思索片刻然后：嗯，月色不错，没有星星，明天应该是阴天！
狄仁杰：笨蛋！我们的帐篷被偷了！
包拯：两位莫惊，帐篷还在！是我......
终于有人发明了治疗拖延症的大杀器！
这位仁兄花钱雇了个妹子坐自己旁边，
每次自己上社交媒体网站，妹子就给他一大嘴巴。。。
软件分析结果显示在3小时实验中他的工作效率提高了4倍
http://t.cn/zlHecCN
嗯，每次刷微博就给一嘴巴，
估计很多单位的工作效率都会大幅提高。。
现代和古代的一大区别就是
古代，你遇见一个乞丐，没准他是皇帝，武功高手。
现代，你遇见一个乞丐，他绝对就是个乞丐
完成N盘游戏获得战功 无效？
fix sysrcd
Add clickable links for item lists and views
XMLUI: Add new strings for CRP Subjects and River Basin subjects
input-forms: New values for CCAFS and CRP input forms
added for admin view entry
Cells option group in NOVA_CONF
Make sed edit in place
Add bcrypt-ruby to Gemfile

Allow use of ActiveModel has_secure_password
Set raise_not_found_error to false

When performing a #find and the document is not found it returns nil
instead of raising an error.
Display flash messages on application's layout

Flash error and notices displayed automatically on the
application's layouts.
Add style for flash messages

Style for flash_notice, flash_error and flash_alert.
Add current_user helper on application controller

It holds the current user in case it's logged in.
Add sessions controller

Define create and destroy method to manage user sessions.
Add login view

The new view of sessions it holds the login form.
Modify User model to support authentication

Includes ActiveModel::SecurePassword to use has_secure_password.
Validates presence of password on create.
password_digest hold the password hash on db.
Modify user's new form as a signup form

Add password and password_confirmation field for singup purposes.
Add authentication routes

login and logout routes points to sessions controller and signup to
the user's new form.
Solve merge conflicts
Merge branch 'master' of github.com:alealmuna/junta
Small improvements to the buildsystem.

- Handle LIBDIR as library installation path.
- Set default for PREFIX,LIBDIR if unset.
added more alignment
added ant lib
single file use implemented
files uploaded

uploaded d3 js file, demo html file, line graph js file, line graph json
file, line graph css file
Setup testing environment, install eutester
login.js變更登入背景品
fixed login trouble with username
checkin before deploy
p: save_meta_data: store directory names with a trailing '/'

This will allow having ignore entries/patterns matching
specifically on directories.
Strip this slash while checking file ownership.

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
p: ignore patterns need to match the full file name

doing only substring match was bad

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
p: remove cruft from ignore lists

most of this looks like some HACKS or workarounds and is not
needed for squeeze or later
some data directories can be purged by proper preseeding

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
p: regroup ignore lists

reorder ignore lists, add some comments to build groups
unify regexps

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
p: unify ignore patterns

simplify/unify now that we can distinguish files and directories

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
p: ignore default system logfiles

as created by all incarnations of syslogd by default

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
p: work around #316521 dpkg: incomplete cleanup of empty directories

add some common leftover directories to the ignore list

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
p: ignore cdebconf state files

Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
init commit
Merge branch 'master' of https://github.com/andbas/research
add rails 3 configs / files
glw: Resolve realtive paths when setting font
hide the password by default when opening a wifi dialog
quick fix on PSK auth to match mrbkap's current API
WEP has just been reported to work \o/
Merge pull request #758 from fabi1cazenave/wifi

Wifi -- quick fixes
Auto-merge from branch 'master'
added download url to setup.py
fix download link
Changed project name from Checkers to sadbagel.
More of a test.
Mocking the lot of you.
Development branch test.
Pingas
	committing things.
adding ai file
Too. Many. Errors.
This working?
Testing something.
Having Trouble Pushing....
Merge branch 'development' of git://github.com/andrue/sadbagel into development

Conflicts:
	src/com/sadbagel/checkers/Checkers.java

There is only a small chance this will ruin everything forever
basic spring application + html5/css/js
rename step button to run
fixed profile
fixed comments
Put bare repo in created user's home directory.
Clean up user directory management.
Adds ArchLinux build file

Adds PKGBUILD file required to build Arch Linux packages
Fixes Arch PKGBUILD dependencies

Adds missing depends (python2-yaml helps...)
Adds missing build deps (fakeroot)
Merge pull request #181 from leucos/integration

Adds PKGBUILD file for Arch linux